/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_non_ascii.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-17 21:20:55 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7050.
  • Revision ID: jelmer@jelmer.uk-20180717212055-apkv1s70oo6wpi6o
Fix a few more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_non_ascii.py
64
64
            out = self.run_bzr(args, encoding=encoding,
65
65
                               retcode=retcode, working_dir=working_dir)[0]
66
66
            if PY3:
67
 
                return out
 
67
                return out.encode(encoding, 'replace').decode(encoding)
68
68
            else:
69
69
                return out.decode(encoding)
70
70
        except UnicodeError as e:
151
151
 
152
152
        txt = self.run_bzr_decode('status', encoding='ascii')
153
153
        expected = u'modified:\n  %s\n' % (
154
 
                    self.info['filename'].encode('ascii', 'replace'),)
 
154
                    self.info['filename'].encode('ascii', 'replace').decode('ascii'),)
155
155
        self.assertEqual(expected, txt)
156
156
 
157
157
    def test_cat(self):
553
553
        txt = self.run_bzr_decode(['ignored'])
554
554
        self.assertEqual(txt, '%-50s %s\n' % (fname, fname))
555
555
        txt = self.run_bzr_decode(['ignored'], encoding='ascii')
556
 
        fname = fname.encode('ascii', 'replace')
 
556
        fname = fname.encode('ascii', 'replace').decode('ascii')
557
557
        self.assertEqual(txt, '%-50s %s\n' % (fname, fname))