← 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: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

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