Rev 6313: (jelmer) Cope with slight differences in number of HPSS call counts for 'bzr in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6313 [merge]
revision-id: pqm at pqm.ubuntu.com-20111128121442-e21724bjf6i6d5xo
parent: pqm at pqm.ubuntu.com-20111128114943-exp17aodb5tydnkj
parent: jelmer at samba.org-20111128111705-ut4ilm4aew2n03sa
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-11-28 12:14:42 +0000
message:
  (jelmer) Cope with slight differences in number of HPSS call counts for 'bzr
   verify-signatures' test. (Jelmer Vernooij)
modified:
  bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
=== modified file 'bzrlib/tests/blackbox/test_sign_my_commits.py'
--- a/bzrlib/tests/blackbox/test_sign_my_commits.py	2011-11-22 23:31:21 +0000
+++ b/bzrlib/tests/blackbox/test_sign_my_commits.py	2011-11-28 11:17:05 +0000
@@ -177,4 +177,15 @@
         self.reset_smart_call_log()
         self.run_bzr('sign-my-commits')
         out = self.run_bzr(['verify-signatures', self.get_url('branch')])
-        self.assertLength(21, self.hpss_calls)
+        # This figure represent the amount of work to perform this use case. It
+        # is entirely ok to reduce this number if a test fails due to rpc_count
+        # being too low. If rpc_count increases, more network roundtrips have
+        # become necessary for this use case. Please do not adjust this number
+        # upwards without agreement from bzr's network support maintainers.
+
+        # The number of readv requests seems to vary depending on the generated
+        # repository and how well it compresses, so allow for a bit of
+        # variation:
+        if len(self.hpss_calls) not in (21, 22):
+            self.fail("Incorrect length: wanted 21 or 22, got %d for %r" % (
+                len(self.hpss_calls), self.hpss_calls))