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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-m/+merge/348800

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
469
469
        new_tree = self.b.repository.revision_tree(b'rev-4')
470
470
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
471
471
                            working_tree=self.wt)
472
 
        self.assertContainsRe(out, 'file1\t')
 
472
        self.assertContainsRe(out, b'file1\t')
473
473
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
474
474
                            working_tree=self.wt)
475
 
        self.assertNotContainsRe(out, 'file1\t')
 
475
        self.assertNotContainsRe(out, b'file1\t')
476
476
 
477
477
 
478
478
class TestShowDiffTrees(tests.TestCaseWithTransport):