/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: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
43
43
    features,
44
44
    test_commit,
45
45
    )
46
 
from ..tree import find_previous_path
 
46
from ..tree import InterTree
47
47
 
48
48
 
49
49
def get_text(vf, key):
562
562
 
563
563
        for path, status, kind, entry in base_files:
564
564
            # Check that the meta information is the same
565
 
            to_path = find_previous_path(base_tree, to_tree, path)
 
565
            to_path = InterTree.get(base_tree, to_tree).find_target_path(path)
566
566
            self.assertEqual(
567
567
                base_tree.get_file_size(path),
568
568
                to_tree.get_file_size(to_path))
1796
1796
        writer = v4.BundleWriter(fileobj)
1797
1797
        writer.begin()
1798
1798
        writer.add_info_record({b'foo': b'bar'})
1799
 
        writer._container.add_bytes_record(b'blah', [(b'two', ), (b'names', )])
 
1799
        writer._container.add_bytes_record([b'blah'], len(b'blah'), [(b'two', ), (b'names', )])
1800
1800
        writer.end()
1801
1801
        fileobj.seek(0)
1802
1802
        record_iter = v4.BundleReader(fileobj).iter_records()