/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 bzrlib/tests/blackbox/test_export.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-23 16:53:08 UTC
  • mto: This revision was merged to the branch mainline in revision 2036.
  • Revision ID: john@arbash-meinel.com-20060923165308-821b9c574cfea136
Set the external_attr bits so Windows respects our directories

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_export.py
19
19
"""
20
20
 
21
21
import os
 
22
import stat
22
23
import sys
23
24
import tarfile
24
25
import zipfile
25
26
 
 
27
from bzrlib.export import (
 
28
    zip_exporter,
 
29
    )
26
30
from bzrlib.tests import TestSkipped
27
31
from bzrlib.tests.blackbox import ExternalBase
28
32
 
106
110
        self.run_bzr('export', 'test.zip')
107
111
        zfile = zipfile.ZipFile('test.zip')
108
112
        names = sorted(zfile.namelist())
 
113
 
109
114
        if sys.platform == 'win32':
110
 
            self.assertEqual(['a', 'b\\', 'b\\c', 'd\\'], names)
 
115
            self.assertEqual(['test\\a', 'test\\b\\', 'test\\b\\c', 'test\\d\\'], names)
111
116
        else:
112
 
            self.assertEqual(['a', 'b/', 'b/c', 'd/'], names)
 
117
            self.assertEqual(['test/a', 'test/b/', 'test/b/c', 'test/d/'], names)
 
118
 
 
119
        file_attr = stat.S_IFREG | zip_exporter._FILE_MODE
 
120
        dir_attr = (stat.S_IFDIR | zip_exporter._DIR_MODE
 
121
                    | zip_exporter.ZIP_DIRECTORY_BIT)
 
122
 
 
123
        a_info = zfile.getinfo(names[0])
 
124
        self.assertEqual(file_attr, a_info.external_attr)
 
125
 
 
126
        b_info = zfile.getinfo(names[1])
 
127
        self.assertEqual(dir_attr, b_info.external_attr)
 
128
 
 
129
        c_info = zfile.getinfo(names[2])
 
130
        self.assertEqual(file_attr, c_info.external_attr)
 
131
 
 
132
        d_info = zfile.getinfo(names[3])
 
133
        self.assertEqual(dir_attr, d_info.external_attr)
113
134
 
114
135
    def test_dir_export(self):
115
136
        tree = self.make_branch_and_tree('dir')