[trivial][merge] unbreak benchmarks

[Martin Pool]

This code depended on some other modules already being loaded, and
breaks the benchmarks in bzr.dev:

# Bazaar revision bundle v0.9
#
# message:
#   fix import order dependency that broke benchmarks
# committer: Martin Pool <mbp at sourcefrog.net>
# date: Tue 2007-04-17 16:51:02.299999952 +1000

=== modified file bzrlib/tests/__init__.py
--- bzrlib/tests/__init__.py
+++ bzrlib/tests/__init__.py
@@ -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

=== modified directory  // last-changed:mbp at sourcefrog.net-20070417065102-zabhm
... s9y28q2ik00
# revision id: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
# sha1: 4017fbf5a24fcf434893d242c825ecf217e02554
# inventory sha1: 7eee70a86e7cb4309f6e0580b9ddc08b2a87a9cf
# parent ids:
#   pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
# base id: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
# properties:
#   branch-nick: benchmarks



-- 
Martin