Rev 5048: -s bt.per_branch.test_hooks passing in file:///home/vila/src/bzr/cleanup/test-servers/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/test-servers/

------------------------------------------------------------
revno: 5048
revision-id: v.ladeuil+lp at free.fr-20100209211430-pdbmzka563gig6wk
parent: v.ladeuil+lp at free.fr-20100209211324-4phvpk3owca5dgoe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:14:30 +0100
message:
  -s bt.per_branch.test_hooks passing
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_hooks.py'
--- a/bzrlib/tests/per_branch/test_hooks.py	2010-02-05 14:06:57 +0000
+++ b/bzrlib/tests/per_branch/test_hooks.py	2010-02-09 21:14:30 +0000
@@ -23,8 +23,7 @@
     revision,
     tests,
     )
-from bzrlib.smart import server
-
+from bzrlib.tests import test_server
 
 class ChangeBranchTipTestCase(tests.TestCaseWithMemoryTransport):
     """Base TestCase for testing pre/post_change_branch_tip hooks."""
@@ -151,8 +150,8 @@
         b = self.make_branch('.')
         if isinstance(b, remote.RemoteBranch):
             # RemoteBranch creation:
-            if (self.transport_readonly_server ==
-                server.ReadonlySmartTCPServer_for_testing_v2_only):
+            if (self.transport_readonly_server
+                == test_server.ReadonlySmartTCPServer_for_testing_v2_only):
                 # Older servers:
                 self.assertEqual(3, len(self.hook_calls))
                 # creates the branch via the VFS (for older servers)