Rev 5059: -s bt.per_repository.test_repo passing in file:///home/vila/src/bzr/cleanup/test-servers/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5059
revision-id: v.ladeuil+lp at free.fr-20100209213431-o2pmdzu3xnv9n6lp
parent: v.ladeuil+lp at free.fr-20100209213152-3nl4yl4ksd3sd30f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:34:31 +0100
message:
  -s bt.per_repository.test_repo passing
-------------- next part --------------
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2010-02-05 14:36:54 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2010-02-09 21:34:31 +0000
@@ -43,9 +43,10 @@
     pack_repo,
     weaverepo,
     )
-from bzrlib.smart import server
-from bzrlib.tests import per_repository
-from bzrlib.transport.fakevfat import FakeVFATServer
+from bzrlib.tests import (
+    per_repository,
+    test_server,
+    )
 
 
 class TestRepositoryMakeBranchAndTree(per_repository.TestCaseWithRepository):
@@ -820,7 +821,7 @@
         """Make a RemoteRepository object backed by a real repository that will
         be created at the given path."""
         repo = self.make_repository(path, shared=shared)
-        smart_server = server.SmartTCPServer_for_testing()
+        smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(smart_server, self.get_server())
         remote_transport = transport.get_transport(
             smart_server.get_url()).clone(path)
@@ -1292,7 +1293,7 @@
         # about local disk layout/support.
         if isinstance(self.repository_format, remote.RemoteRepositoryFormat):
             return
-        self.transport_server = FakeVFATServer
+        self.transport_server = test_server.FakeVFATServer
         FOO_ID = 'foo<:>ID'
         REV_ID = 'revid-1'
         # this makes a default format repository always, which is wrong: