← 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: 2010-09-23 09:00:18 UTC
  • mfrom: (5439.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100923090018-01aj4ifyzaps50bo
(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_export.py
66
66
        self.assertEqual(['test/a'], sorted(ball.getnames()))
67
67
 
68
68
    def test_tar_export_unicode(self):
 
69
        self.requireFeature(tests.UnicodeFilenameFeature)
69
70
        tree = self.make_branch_and_tree('tar')
70
71
        # FIXME: using fname = u'\xe5.txt' below triggers a bug revealed since
71
72
        # bzr.dev revno 4216 but more related to OSX/working trees/unicode than
72
73
        # export itself --vila 20090406
73
74
        fname = u'\N{Euro Sign}.txt'
74
 
        try:
75
 
            self.build_tree(['tar/' + fname])
76
 
        except UnicodeError:
77
 
            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
 
75
        self.build_tree(['tar/' + fname])
78
76
        tree.add([fname])
79
77
        tree.commit('first')
80
78
 
87
85
 
88
86
    def test_tar_export_unicode_basedir(self):
89
87
        """Test for bug #413406"""
 
88
        self.requireFeature(tests.UnicodeFilenameFeature)
90
89
        basedir = u'\N{euro sign}'
91
90
        os.mkdir(basedir)
92
91
        os.chdir(basedir)
119
118
        self.assertEqual(['test/a'], sorted(zfile.namelist()))
120
119
 
121
120
    def test_zip_export_unicode(self):
 
121
        self.requireFeature(tests.UnicodeFilenameFeature)
122
122
        tree = self.make_branch_and_tree('zip')
123
123
        fname = u'\N{Euro Sign}.txt'
124
 
        try:
125
 
            self.build_tree(['zip/' + fname])
126
 
        except UnicodeError:
127
 
            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
 
124
        self.build_tree(['zip/' + fname])
128
125
        tree.add([fname])
129
126
        tree.commit('first')
130
127