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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-15 15:17:02 UTC
  • mfrom: (7325.1.2 drop-file-id)
  • Revision ID: breezy.the.bot@gmail.com-20190615151702-68i2hwesjurzj8xy
Get rid of file ids in some more places.

Merged from https://code.launchpad.net/~jelmer/brz/drop-file-id/+merge/368862

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
44
44
    test_commit,
45
45
    )
46
46
from ..transform import TreeTransform
 
47
from ..tree import find_previous_path
47
48
 
48
49
 
49
50
def get_text(vf, key):
587
588
 
588
589
        for path, status, kind, entry in base_files:
589
590
            # Check that the meta information is the same
 
591
            to_path = find_previous_path(base_tree, to_tree, path)
590
592
            self.assertEqual(
591
593
                base_tree.get_file_size(path),
592
 
                to_tree.get_file_size(to_tree.id2path(entry.file_id)))
 
594
                to_tree.get_file_size(to_path))
593
595
            self.assertEqual(
594
 
                base_tree.get_file_sha1(path, entry.file_id),
595
 
                to_tree.get_file_sha1(to_tree.id2path(entry.file_id)))
 
596
                base_tree.get_file_sha1(path),
 
597
                to_tree.get_file_sha1(to_path))
596
598
            # Check that the contents are the same
597
599
            # This is pretty expensive
598
600
            # self.assertEqual(base_tree.get_file(fileid).read(),