/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: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
        tree.lock_write()
53
53
        try:
54
54
            old_root = tree.get_root_id()
55
 
            tree.set_root_id('new-root')
 
55
            tree.add('')
56
56
            # to detect that the inventory is written by flush, we
57
57
            # first check that it was not written yet.
58
58
            reference_tree = tree.controldir.open_workingtree()
61
61
            tree.flush()
62
62
            # and check it was written using another reference tree
63
63
            reference_tree = tree.controldir.open_workingtree()
64
 
            self.assertEqual('new-root', reference_tree.get_root_id())
 
64
            self.assertIsNot(None, reference_tree.get_root_id())
65
65
        finally:
66
66
            tree.unlock()
67
67