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

  • Committer: Jelmer Vernooij
  • Date: 2018-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree_4.py
717
717
        tree = self.get_tree_with_cachable_file_foo()
718
718
        expected_sha1 = osutils.sha_file_by_name('foo')
719
719
        statvalue = os.lstat("foo")
720
 
        tree._observed_sha1(b"foo-id", "foo", (expected_sha1, statvalue))
 
720
        tree._observed_sha1("foo", (expected_sha1, statvalue))
721
721
        entry = tree._get_entry(path="foo")
722
722
        entry_state = entry[1][0]
723
723
        self.assertEqual(expected_sha1, entry_state[1])
739
739
        with tree.lock_read():
740
740
            current_sha1 = tree._get_entry(path="foo")[1][0][1]
741
741
        with tree.lock_write():
742
 
            tree._observed_sha1(b"foo-id", "foo",
 
742
            tree._observed_sha1("foo",
743
743
                (osutils.sha_file_by_name('foo'), os.lstat("foo")))
744
744
            # Must not have changed
745
745
            self.assertEqual(current_sha1,