← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 15:54:17 UTC
  • mfrom: (6428 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105155417-zvjqr0v78zp332e0
Merge trunk resolving conflicts and fixing more test failures related to
more option being migrated which in turn reduce some hpss_calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
889
889
        # being too low. If rpc_count increases, more network roundtrips have
890
890
        # become necessary for this use case. Please do not adjust this number
891
891
        # upwards without agreement from bzr's network support maintainers.
892
 
        self.assertLength(210, self.hpss_calls)
 
892
        self.assertLength(211, self.hpss_calls)
 
893
        self.assertLength(2, self.hpss_connections)
893
894
        self.expectFailure("commit still uses VFS calls",
894
895
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)