← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-12 16:12:23 UTC
  • mfrom: (6060.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110812161223-hfvwsgbtb9vype5r
(vila) Merge 2.4 into trunk (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
289
289
        builder = self.make_branch_builder('source')
290
290
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
291
291
        source.tags.set_tag('tag-a', 'rev-2')
 
292
        source.get_config().set_user_option('branch.fetch_tags', 'True')
292
293
        # Now source has a tag not in its ancestry.  Make a branch from it.
293
294
        self.run_bzr('branch source new-branch')
294
295
        new_branch = branch.Branch.open('new-branch')
440
441
        # being too low. If rpc_count increases, more network roundtrips have
441
442
        # become necessary for this use case. Please do not adjust this number
442
443
        # upwards without agreement from bzr's network support maintainers.
443
 
        self.assertLength(36, self.hpss_calls)
 
444
        self.assertLength(37, self.hpss_calls)
444
445
 
445
446
    def test_branch_from_trivial_branch_streaming_acceptance(self):
446
447
        self.setup_smart_server_with_call_log()
455
456
        # being too low. If rpc_count increases, more network roundtrips have
456
457
        # become necessary for this use case. Please do not adjust this number
457
458
        # upwards without agreement from bzr's network support maintainers.
458
 
        self.assertLength(9, self.hpss_calls)
 
459
        self.assertLength(10, self.hpss_calls)
459
460
 
460
461
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
461
462
        self.setup_smart_server_with_call_log()
475
476
        # being too low. If rpc_count increases, more network roundtrips have
476
477
        # become necessary for this use case. Please do not adjust this number
477
478
        # upwards without agreement from bzr's network support maintainers.
478
 
        self.assertLength(14, self.hpss_calls)
 
479
        self.assertLength(15, self.hpss_calls)
479
480
 
480
481
    def test_branch_from_branch_with_tags(self):
481
482
        self.setup_smart_server_with_call_log()
482
483
        builder = self.make_branch_builder('source')
483
484
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
485
        source.get_config().set_user_option('branch.fetch_tags', 'True')
484
486
        source.tags.set_tag('tag-a', 'rev-2')
485
487
        source.tags.set_tag('tag-missing', 'missing-rev')
486
488
        # Now source has a tag not in its ancestry.  Make a branch from it.
491
493
        # being too low. If rpc_count increases, more network roundtrips have
492
494
        # become necessary for this use case. Please do not adjust this number
493
495
        # upwards without agreement from bzr's network support maintainers.
494
 
        self.assertLength(9, self.hpss_calls)
 
496
        self.assertLength(10, self.hpss_calls)
495
497
 
496
498
    def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
497
499
        self.setup_smart_server_with_call_log()