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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-21 17:44:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7355.
  • Revision ID: jelmer@jelmer.uk-20190621174410-ay2siu5stq1mkuvk
Fix merge modified test on python3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
1816
1816
        self.assertEqual(this.wt.get_file('i.OTHER').read(),
1817
1817
                         b'h\ni\nj\nk\n')
1818
1818
        self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1819
 
        modified = [b'a', b'b', b'c', b'h', b'i']
 
1819
        modified = ['a', 'b', 'c', 'h', 'i']
1820
1820
        merge_modified = this.wt.merge_modified()
1821
1821
        self.assertSubset(merge_modified, modified)
1822
1822
        self.assertEqual(len(merge_modified), len(modified))