/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/per_workingtree/test_flush.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
MergeĀ rename-controldirĀ branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
            tree.set_root_id('new-root')
56
56
            # to detect that the inventory is written by flush, we
57
57
            # first check that it was not written yet.
58
 
            reference_tree = tree.bzrdir.open_workingtree()
 
58
            reference_tree = tree.controldir.open_workingtree()
59
59
            self.assertEqual(old_root, reference_tree.get_root_id())
60
60
            # now flush the tree which should write the inventory.
61
61
            tree.flush()
62
62
            # and check it was written using another reference tree
63
 
            reference_tree = tree.bzrdir.open_workingtree()
 
63
            reference_tree = tree.controldir.open_workingtree()
64
64
            self.assertEqual('new-root', reference_tree.get_root_id())
65
65
        finally:
66
66
            tree.unlock()