← 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: Jelmer Vernooij
  • Date: 2011-12-19 19:15:58 UTC
  • mfrom: (6388 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6404.
  • Revision ID: jelmer@canonical.com-20111219191558-p1k7cvhjq8l6v2gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
36
36
    HardlinkFeature,
37
37
    )
38
38
from bzrlib.tests.blackbox import test_switch
 
39
from bzrlib.tests.matchers import ContainsNoVfsCalls
39
40
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
40
41
from bzrlib.tests.script import run_script
41
42
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
78
79
        self.assertEqual('', out)
79
80
        self.assertEqual('Branched 2 revisions.\n', err)
80
81
        out, err = self.run_bzr('branches b')
81
 
        self.assertEqual(" orig\n thiswasa\n", out)
 
82
        self.assertEqual(" thiswasa\n orig\n", out)
82
83
        self.assertEqual('', err)
83
84
        out,err = self.run_bzr('branch a file:b,branch=orig', retcode=3)
84
85
        self.assertEqual('', out)
482
483
        # being too low. If rpc_count increases, more network roundtrips have
483
484
        # become necessary for this use case. Please do not adjust this number
484
485
        # upwards without agreement from bzr's network support maintainers.
485
 
        self.assertLength(40, self.hpss_calls)
 
486
        self.assertLength(33, self.hpss_calls)
 
487
        self.expectFailure("branching to the same branch requires VFS access",
 
488
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
486
489
 
487
490
    def test_branch_from_trivial_branch_streaming_acceptance(self):
488
491
        self.setup_smart_server_with_call_log()
497
500
        # being too low. If rpc_count increases, more network roundtrips have
498
501
        # become necessary for this use case. Please do not adjust this number
499
502
        # upwards without agreement from bzr's network support maintainers.
 
503
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
500
504
        self.assertLength(10, self.hpss_calls)
501
505
 
502
506
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
518
522
        # become necessary for this use case. Please do not adjust this number
519
523
        # upwards without agreement from bzr's network support maintainers.
520
524
        self.assertLength(15, self.hpss_calls)
 
525
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
521
526
 
522
527
    def test_branch_from_branch_with_tags(self):
523
528
        self.setup_smart_server_with_call_log()
535
540
        # become necessary for this use case. Please do not adjust this number
536
541
        # upwards without agreement from bzr's network support maintainers.
537
542
        self.assertLength(10, self.hpss_calls)
 
543
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
538
544
 
539
545
    def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
540
546
        self.setup_smart_server_with_call_log()
554
560
            c for c in self.hpss_calls
555
561
            if c.call.method == 'readv' and c.call.args[-1].endswith('.rix')]
556
562
        self.assertLength(0, readvs_of_rix_files)
 
563
        self.expectFailure("branching to stacked requires VFS access",
 
564
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
557
565
 
558
566
 
559
567
class TestRemoteBranch(TestCaseWithSFTPServer):