/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/plugins/fastimport/tests/test_generic_processor.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:
breezy/plugins/fastimport/tests/test_generic_processor.py
173
173
                    str(expected_kind_changed_entry), kind_changed_files))
174
174
 
175
175
    def assertContent(self, branch, tree, path, content):
176
 
        file_id = tree.path2id(path)
177
176
        with branch.lock_read():
178
 
            self.assertEqual(tree.get_file_text(path, file_id), content)
 
177
            self.assertEqual(tree.get_file_text(path), content)
179
178
 
180
179
    def assertSymlinkTarget(self, branch, tree, path, target):
181
 
        file_id = tree.path2id(path)
182
180
        with branch.lock_read():
183
 
            self.assertEqual(tree.get_symlink_target(path, file_id), target)
 
181
            self.assertEqual(tree.get_symlink_target(path), target)
184
182
 
185
183
    def assertExecutable(self, branch, tree, path, executable):
186
184
        with branch.lock_read():