← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-08 06:22:11 UTC
  • mfrom: (4241.8.9 bzr.1.14)
  • Revision ID: pqm@pqm.ubuntu.com-20090408062211-qhu50uezgnlj7ked
(tanner) merge 1.14rc1 back into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_export.py
25
25
import tarfile
26
26
import zipfile
27
27
 
28
 
from bzrlib.export import (
29
 
    zip_exporter,
 
28
 
 
29
from bzrlib import (
 
30
    export,
 
31
    tests,
30
32
    )
31
 
from bzrlib.tests import TestSkipped
32
33
from bzrlib.tests.blackbox import ExternalBase
33
34
 
34
35
 
66
67
 
67
68
    def test_tar_export_unicode(self):
68
69
        tree = self.make_branch_and_tree('tar')
69
 
        fname = u'\xe5.txt'
 
70
        # FIXME: using fname = u'\xe5.txt' below triggers a bug revealed since
 
71
        # bzr.dev revno 4216 but more related to OSX/working trees/unicode than
 
72
        # export itself --vila 20090406
 
73
        fname = u'\N{Euro Sign}.txt'
70
74
        try:
71
75
            self.build_tree(['tar/' + fname])
72
76
        except UnicodeError:
73
 
            raise TestSkipped('Unable to represent path %r' % (fname,))
 
77
            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
74
78
        tree.add([fname])
75
79
        tree.commit('first')
76
80
 
107
111
 
108
112
    def test_zip_export_unicode(self):
109
113
        tree = self.make_branch_and_tree('zip')
110
 
        fname = u'\xe5.txt'
 
114
        fname = u'\N{Euro Sign}.txt'
111
115
        try:
112
116
            self.build_tree(['zip/' + fname])
113
117
        except UnicodeError:
114
 
            raise TestSkipped('Unable to represent path %r' % (fname,))
 
118
            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
115
119
        tree.add([fname])
116
120
        tree.commit('first')
117
121
 
138
142
        self.assertEqual(['test/a', 'test/b/', 'test/b/c', 'test/d/'], names)
139
143
 
140
144
        file_attr = stat.S_IFREG
141
 
        dir_attr = stat.S_IFDIR | zip_exporter.ZIP_DIRECTORY_BIT
 
145
        dir_attr = stat.S_IFDIR | export.zip_exporter.ZIP_DIRECTORY_BIT
142
146
 
143
147
        a_info = zfile.getinfo(names[0])
144
148
        self.assertEqual(file_attr, a_info.external_attr)