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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf_ui.py
302
302
    def test_shelve_old_root_preserved(self):
303
303
        tree1 = self.make_branch_and_tree('tree1')
304
304
        tree1.commit('add root')
305
 
        tree1_root_id = tree1.path2id('')
 
305
        tree1_root_id = tree1.get_root_id()
306
306
        tree2 = self.make_branch_and_tree('tree2')
307
307
        rev2 = tree2.commit('add root')
308
 
        self.assertNotEqual(tree1_root_id, tree2.path2id(''))
 
308
        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
309
309
        tree1.merge_from_branch(tree2.branch,
310
310
                                from_revision=revision.NULL_REVISION)
311
311
        tree1.commit('merging in tree2')
312
 
        self.assertEqual(tree1_root_id, tree1.path2id(''))
 
312
        self.assertEqual(tree1_root_id, tree1.get_root_id())
313
313
        # This is essentially assertNotRaises(InconsistentDelta)
314
314
        # With testtools 0.9.9, it can be rewritten as:
315
315
        # with ExpectedException(AssertionError,