← 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-30 15:26:18 UTC
  • mfrom: (6407 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6408.
  • Revision ID: jelmer@samba.org-20111230152618-afeyhel5dn4hfnxb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
483
483
        # being too low. If rpc_count increases, more network roundtrips have
484
484
        # become necessary for this use case. Please do not adjust this number
485
485
        # upwards without agreement from bzr's network support maintainers.
 
486
        self.assertLength(2, self.hpss_connections)
486
487
        self.assertLength(33, self.hpss_calls)
487
488
        self.expectFailure("branching to the same branch requires VFS access",
488
489
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
502
503
        # upwards without agreement from bzr's network support maintainers.
503
504
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
504
505
        self.assertLength(10, self.hpss_calls)
 
506
        self.assertLength(1, self.hpss_connections)
505
507
 
506
508
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
507
509
        self.setup_smart_server_with_call_log()
522
524
        # become necessary for this use case. Please do not adjust this number
523
525
        # upwards without agreement from bzr's network support maintainers.
524
526
        self.assertLength(15, self.hpss_calls)
 
527
        self.assertLength(1, self.hpss_connections)
525
528
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
526
529
 
527
530
    def test_branch_from_branch_with_tags(self):
541
544
        # upwards without agreement from bzr's network support maintainers.
542
545
        self.assertLength(10, self.hpss_calls)
543
546
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
547
        self.assertLength(1, self.hpss_connections)
544
548
 
545
549
    def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
546
550
        self.setup_smart_server_with_call_log()
559
563
        readvs_of_rix_files = [
560
564
            c for c in self.hpss_calls
561
565
            if c.call.method == 'readv' and c.call.args[-1].endswith('.rix')]
 
566
        self.assertLength(1, self.hpss_connections)
562
567
        self.assertLength(0, readvs_of_rix_files)
563
568
        self.expectFailure("branching to stacked requires VFS access",
564
569
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)