/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

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
593
593
        for base_file, to_file in zip(base_files, to_files):
594
594
            self.assertEqual(base_file, to_file)
595
595
 
596
 
        for path, status, kind, fileid, entry in base_files:
 
596
        for path, status, kind, entry in base_files:
597
597
            # Check that the meta information is the same
598
598
            self.assertEqual(
599
599
                base_tree.get_file_size(path),
600
 
                to_tree.get_file_size(to_tree.id2path(fileid)))
 
600
                to_tree.get_file_size(to_tree.id2path(entry.file_id)))
601
601
            self.assertEqual(
602
 
                base_tree.get_file_sha1(path),
603
 
                to_tree.get_file_sha1(to_tree.id2path(fileid)))
 
602
                base_tree.get_file_sha1(path, entry.file_id),
 
603
                to_tree.get_file_sha1(to_tree.id2path(entry.file_id)))
604
604
            # Check that the contents are the same
605
605
            # This is pretty expensive
606
606
            # self.assertEqual(base_tree.get_file(fileid).read(),