← 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-09 12:34:00 UTC
  • mfrom: (6056.2.5 option-registry)
  • Revision ID: pqm@pqm.ubuntu.com-20110809123400-x521f2j9jkxx8ze2
(vila) Introduce OptionRegistry (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')
293
292
        # Now source has a tag not in its ancestry.  Make a branch from it.
294
293
        self.run_bzr('branch source new-branch')
295
294
        new_branch = branch.Branch.open('new-branch')
441
440
        # being too low. If rpc_count increases, more network roundtrips have
442
441
        # become necessary for this use case. Please do not adjust this number
443
442
        # upwards without agreement from bzr's network support maintainers.
444
 
        self.assertLength(37, self.hpss_calls)
 
443
        self.assertLength(36, self.hpss_calls)
445
444
 
446
445
    def test_branch_from_trivial_branch_streaming_acceptance(self):
447
446
        self.setup_smart_server_with_call_log()
456
455
        # being too low. If rpc_count increases, more network roundtrips have
457
456
        # become necessary for this use case. Please do not adjust this number
458
457
        # upwards without agreement from bzr's network support maintainers.
459
 
        self.assertLength(10, self.hpss_calls)
 
458
        self.assertLength(9, self.hpss_calls)
460
459
 
461
460
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
462
461
        self.setup_smart_server_with_call_log()
476
475
        # being too low. If rpc_count increases, more network roundtrips have
477
476
        # become necessary for this use case. Please do not adjust this number
478
477
        # upwards without agreement from bzr's network support maintainers.
479
 
        self.assertLength(15, self.hpss_calls)
 
478
        self.assertLength(14, self.hpss_calls)
480
479
 
481
480
    def test_branch_from_branch_with_tags(self):
482
481
        self.setup_smart_server_with_call_log()
483
482
        builder = self.make_branch_builder('source')
484
483
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
485
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
486
484
        source.tags.set_tag('tag-a', 'rev-2')
487
485
        source.tags.set_tag('tag-missing', 'missing-rev')
488
486
        # Now source has a tag not in its ancestry.  Make a branch from it.
493
491
        # being too low. If rpc_count increases, more network roundtrips have
494
492
        # become necessary for this use case. Please do not adjust this number
495
493
        # upwards without agreement from bzr's network support maintainers.
496
 
        self.assertLength(10, self.hpss_calls)
 
494
        self.assertLength(9, self.hpss_calls)
497
495
 
498
496
    def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
499
497
        self.setup_smart_server_with_call_log()