~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_sign_my_commits.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:
21
21
    gpg,
22
22
    tests,
23
23
    )
 
24
from bzrlib.tests.matchers import ContainsNoVfsCalls
24
25
 
25
26
 
26
27
class SignMyCommits(tests.TestCaseWithTransport):
164
165
        # being too low. If rpc_count increases, more network roundtrips have
165
166
        # become necessary for this use case. Please do not adjust this number
166
167
        # upwards without agreement from bzr's network support maintainers.
167
 
        self.assertLength(54, self.hpss_calls)
 
168
        self.assertLength(15, self.hpss_calls)
 
169
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
168
170
 
169
171
    def test_verify_commits(self):
170
172
        self.setup_smart_server_with_call_log()
182
184
        # being too low. If rpc_count increases, more network roundtrips have
183
185
        # become necessary for this use case. Please do not adjust this number
184
186
        # upwards without agreement from bzr's network support maintainers.
185
 
 
186
 
        # The number of readv requests seems to vary depending on the generated
187
 
        # repository and how well it compresses, so allow for a bit of
188
 
        # variation:
189
 
        if len(self.hpss_calls) not in (18, 19):
190
 
            self.fail("Incorrect length: wanted 18 or 19, got %d for %r" % (
191
 
                len(self.hpss_calls), self.hpss_calls))
 
187
        self.assertLength(10, self.hpss_calls)
 
188
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)