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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-17 23:40:50 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7050.
  • Revision ID: jelmer@jelmer.uk-20180717234050-d8ov7a8e6dotrj07
Fix per_pack_repository tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_subsume.py
66
66
        # it is correct.
67
67
        self.assertPathExists('tree/subtree/.bzr')
68
68
        base_tree.subsume(sub_tree)
69
 
        self.assertEqual(['tree-1', 'subtree-1'], base_tree.get_parent_ids())
 
69
        self.assertEqual([b'tree-1', b'subtree-1'], base_tree.get_parent_ids())
70
70
        self.assertEqual(sub_root_id, base_tree.path2id('subtree'))
71
 
        self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
 
71
        self.assertEqual(b'file2-id', base_tree.path2id('subtree/file2'))
72
72
        # subsuming the tree removes the control directory, so you can't open
73
73
        # it.
74
74
        self.assertPathDoesNotExist('tree/subtree/.bzr')
87
87
                             base_tree.get_file_text('subtree/file2'))
88
88
        self.assertEqualDiff(file2_contents,
89
89
                             basis_tree.get_file_text('subtree/file2'))
90
 
        self.assertEqual('subtree-1',
 
90
        self.assertEqual(b'subtree-1',
91
91
                         basis_tree.get_file_revision('subtree/file2'))
92
 
        self.assertEqual('combined-1',
 
92
        self.assertEqual(b'combined-1',
93
93
                         basis_tree.get_file_revision('subtree', sub_root_id))
94
94
 
95
95
    def test_subsume_failure(self):