/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: Jelmer Vernooij
  • Date: 2018-11-21 02:50:08 UTC
  • mto: This revision was merged to the branch mainline in revision 7207.
  • Revision ID: jelmer@jelmer.uk-20181121025008-tiutar263ri5rvkm
Undo removal of kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
603
603
        for base_file, to_file in zip(base_files, to_files):
604
604
            self.assertEqual(base_file, to_file)
605
605
 
606
 
        for path, status, entry in base_files:
 
606
        for path, status, kind, entry in base_files:
607
607
            # Check that the meta information is the same
608
 
            self.assertEqual(base_tree.get_file_size(path),
609
 
                    to_tree.get_file_size(to_tree.id2path(entry.file_id)))
610
 
            self.assertEqual(base_tree.get_file_sha1(path, entry.file_id),
611
 
                    to_tree.get_file_sha1(to_tree.id2path(entry.file_id)))
 
608
            self.assertEqual(
 
609
                base_tree.get_file_size(path),
 
610
                to_tree.get_file_size(to_tree.id2path(entry.file_id)))
 
611
            self.assertEqual(
 
612
                base_tree.get_file_sha1(path, entry.file_id),
 
613
                to_tree.get_file_sha1(to_tree.id2path(entry.file_id)))
612
614
            # Check that the contents are the same
613
615
            # This is pretty expensive
614
616
            # self.assertEqual(base_tree.get_file(fileid).read(),