← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
89
89
            normal_thing = unicodedata.normalize('NFD', path)
90
90
            mac_encoded = normal_thing.encode(fs_enc)
91
91
            if mac_encoded != encoded:
92
 
                raise tests.KnownFailure(
 
92
                self.knownFailure(
93
93
                    'Unable to roundtrip path %r on OSX filesystem'
94
94
                    ' using encoding "%s"'
95
95
                    % (path, fs_enc))
267
267
 
268
268
        expected = osutils.pathjoin(osutils.getcwd(), dirname1)
269
269
        self.assertEqual(u'Using saved parent location: %s/\n'
270
 
                'No revisions to pull.\n' % (expected,), txt)
 
270
                'No revisions or tags to pull.\n' % (expected,), txt)
271
271
 
272
272
        self.build_tree_contents(
273
273
            [(osutils.pathjoin(dirname1, 'a'), 'and yet more\n')])