/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: 2018-07-09 12:18:11 UTC
  • mfrom: (7029.2.2 write-bundle-return-order)
  • Revision ID: breezy.the.bot@gmail.com-20180709121811-d8go69481ye1thno
Don't make assumptions about the order of revisions returned by BundleWrite.write_bundle().

Merged from https://code.launchpad.net/~jelmer/brz/write-bundle-return-order/+merge/349070

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
469
469
                             len(bundle_rev.parent_ids))
470
470
        self.assertEqual(rev_ids,
471
471
                         [r.revision_id for r in bundle.real_revisions])
472
 
        self.valid_apply_bundle(base_rev_id, bundle,
473
 
                                   checkout_dir=checkout_dir)
 
472
        self.valid_apply_bundle(base_rev_id, bundle, checkout_dir=checkout_dir)
474
473
 
475
474
        return bundle
476
475
 
1412
1411
        tree.commit('changed file', rev_id=b'rev2')
1413
1412
        s = BytesIO()
1414
1413
        serializer = BundleSerializerV4('1.0')
1415
 
        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)
1416
1416
        s.seek(0)
1417
1417
        tree2 = self.make_branch_and_tree('target')
1418
1418
        target_repo = tree2.branch.repository
1471
1471
        repo_b = tree_b.branch.repository
1472
1472
        s = BytesIO()
1473
1473
        serializer = BundleSerializerV4('4')
1474
 
        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)
1475
1476
        s.seek(0)
1476
1477
        install_bundle(repo_b, serializer.read(s))
1477
1478
        self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
1662
1663
                                       revision_id=b'a@cset-0-2a').open_branch()
1663
1664
        bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
1664
1665
                                                      b'a@cset-0-3')
1665
 
        self.assertEqual([b'a@cset-0-2b', b'a@cset-0-3'], rev_ids)
 
1666
        self.assertEqual(set([b'a@cset-0-2b', b'a@cset-0-3']), set(rev_ids))
1666
1667
        bundle = read_bundle(bundle_txt)
1667
1668
        target.lock_write()
1668
1669
        self.addCleanup(target.unlock)