/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_export.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-20 15:54:59 UTC
  • mfrom: (6968.2.10 archive)
  • mto: This revision was merged to the branch mainline in revision 6973.
  • Revision ID: jelmer@jelmer.uk-20180520155459-4u1tpealx8jj3sy3
Merge archive branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_export.py
25
25
import zipfile
26
26
 
27
27
 
 
28
from ...archive import zip
28
29
from ... import (
29
30
    export,
30
31
    )
224
225
        # forward slashes
225
226
        self.assertEqual(['test/a', 'test/b/', 'test/b/c', 'test/d/'], names)
226
227
 
227
 
        file_attr = stat.S_IFREG | export.zip_exporter.FILE_PERMISSIONS
228
 
        dir_attr = (stat.S_IFDIR | export.zip_exporter.ZIP_DIRECTORY_BIT |
229
 
                    export.zip_exporter.DIR_PERMISSIONS)
 
228
        file_attr = stat.S_IFREG | zip.FILE_PERMISSIONS
 
229
        dir_attr = (stat.S_IFDIR | zip.ZIP_DIRECTORY_BIT |
 
230
                    zip.DIR_PERMISSIONS)
230
231
 
231
232
        a_info = zfile.getinfo(names[0])
232
233
        self.assertEqual(file_attr, a_info.external_attr)