/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-07-08 11:04:42 UTC
  • mto: This revision was merged to the branch mainline in revision 7031.
  • Revision ID: jelmer@jelmer.uk-20180708110442-3jy07h037wu7onzk
Fix two tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
1411
1411
        tree.commit('changed file', rev_id=b'rev2')
1412
1412
        s = BytesIO()
1413
1413
        serializer = BundleSerializerV4('1.0')
1414
 
        serializer.write(tree.branch.repository, [b'rev1', b'rev2'], {}, s)
 
1414
        with tree.lock_read():
 
1415
            serializer.write_bundle(tree.branch.repository, b'rev2', b'null:', s)
1415
1416
        s.seek(0)
1416
1417
        tree2 = self.make_branch_and_tree('target')
1417
1418
        target_repo = tree2.branch.repository
1470
1471
        repo_b = tree_b.branch.repository
1471
1472
        s = BytesIO()
1472
1473
        serializer = BundleSerializerV4('4')
1473
 
        serializer.write(tree_a.branch.repository, [b'A', b'B'], {}, s)
 
1474
        with tree_a.lock_read():
 
1475
            serializer.write_bundle(tree_a.branch.repository, b'B', b'null:', s)
1474
1476
        s.seek(0)
1475
1477
        install_bundle(repo_b, serializer.read(s))
1476
1478
        self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))