Rev 6349: (jelmer) Fix HPSS call count for 'bzr co --lightweight' and add more HPSS 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: 6349 [merge]
revision-id: pqm at pqm.ubuntu.com-20111206163008-eoqz60dpbysebble
parent: pqm at pqm.ubuntu.com-20111206160501-uxh307vklxc6zztm
parent: jelmer at samba.org-20111205161112-2ennrewfauktq8xt
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-12-06 16:30:08 +0000
message:
  (jelmer) Fix HPSS call count for 'bzr co --lightweight' and add more HPSS
   call count tests. (Jelmer Vernooij)
modified:
  bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
--- a/bzrlib/tests/blackbox/test_checkout.py	2011-12-01 11:13:41 +0000
+++ b/bzrlib/tests/blackbox/test_checkout.py	2011-12-05 16:03:35 +0000
@@ -200,7 +200,7 @@
         # 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.
-        if len(self.hpss_calls) < 35 or len(self.hpss_calls) > 48:
+        if len(self.hpss_calls) < 34 or len(self.hpss_calls) > 48:
             self.fail(
-                "Incorrect length: wanted between 35 and 48, got %d for %r" % (
+                "Incorrect length: wanted between 34 and 48, got %d for %r" % (
                     len(self.hpss_calls), self.hpss_calls))

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2011-11-23 12:00:17 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2011-12-05 16:07:25 +0000
@@ -1085,3 +1085,18 @@
         # become necessary for this use case. Please do not adjust this number
         # upwards without agreement from bzr's network support maintainers.
         self.assertLength(19, self.hpss_calls)
+
+    def test_per_file(self):
+        self.setup_smart_server_with_call_log()
+        t = self.make_branch_and_tree('branch')
+        self.build_tree_contents([('branch/foo', 'thecontents')])
+        t.add("foo")
+        t.commit("message")
+        self.reset_smart_call_log()
+        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])
+        # 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.
+        self.assertLength(21, self.hpss_calls)

=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- a/bzrlib/tests/blackbox/test_uncommit.py	2011-10-14 13:56:45 +0000
+++ b/bzrlib/tests/blackbox/test_uncommit.py	2011-12-05 16:11:12 +0000
@@ -294,3 +294,20 @@
         tree.branch.tags.set_tag("atag", revid)
         out, err = self.run_bzr('uncommit --keep-tags --force tree')
         self.assertEquals({"atag": revid}, tree.branch.tags.get_tag_dict())
+
+
+class TestSmartServerUncommit(TestCaseWithTransport):
+
+    def test_uncommit(self):
+        self.setup_smart_server_with_call_log()
+        t = self.make_branch_and_tree('from')
+        for count in range(2):
+            t.commit(message='commit %d' % count)
+        self.reset_smart_call_log()
+        out, err = self.run_bzr(['uncommit', '--force', self.get_url('from')])
+        # 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.
+        self.assertLength(14, self.hpss_calls)