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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-31 12:16:39 UTC
  • mfrom: (7474.1.1 merge-3.0)
  • Revision ID: breezy.the.bot@gmail.com-20200131121639-02ekdsitrlajp2qx
Merge the 3.0 branch.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.0/+merge/378383

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/__init__.py
1336
1336
        if a == b + ('\n' if isinstance(b, text_type) else b'\n'):
1337
1337
            message = 'second string is missing a final newline.\n'
1338
1338
        raise AssertionError(message
1339
 
                             + self._ndiff_strings(a, b))
 
1339
                             + self._ndiff_strings(
 
1340
                                 a if isinstance(a, text_type) else a.decode(),
 
1341
                                 b if isinstance(b, text_type) else b.decode()))
1340
1342
 
1341
1343
    def assertEqualMode(self, mode, mode_test):
1342
1344
        self.assertEqual(mode, mode_test,