Rev 2426: merge benchmark fix in http://sourcefrog.net/bzr/breakin

[Martin Pool]

At http://sourcefrog.net/bzr/breakin

------------------------------------------------------------
revno: 2426
revision-id: mbp at sourcefrog.net-20070417065314-r4zeer3hcw8j77rw
parent: mbp at sourcefrog.net-20070417052419-x9erzvt3xtzuhdvf
parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Tue 2007-04-17 16:53:14 +1000
message:
  merge benchmark fix
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 2423.1.1
    merged: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
    parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: benchmarks
    timestamp: Tue 2007-04-17 16:51:02 +1000
    message:
      fix import order dependency that broke benchmarks
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-04-13 07:02:10 +0000
+++ b/bzrlib/tests/__init__.py	2007-04-17 06:51:02 +0000
@@ -751,10 +751,15 @@
         self._startLogFile()
         self._benchcalls = []
         self._benchtime = None
+        self._clear_hooks()
+
+    def _clear_hooks(self):
         # prevent hooks affecting tests
+        import bzrlib.branch
+        import bzrlib.smart.server
         self._preserved_hooks = {
-            bzrlib.branch.Branch:bzrlib.branch.Branch.hooks,
-            bzrlib.smart.server.SmartTCPServer:bzrlib.smart.server.SmartTCPServer.hooks,
+            bzrlib.branch.Branch: bzrlib.branch.Branch.hooks,
+            bzrlib.smart.server.SmartTCPServer: bzrlib.smart.server.SmartTCPServer.hooks,
             }
         self.addCleanup(self._restoreHooks)
         # this list of hooks must be kept in sync with the defaults