Rev 5023: Fix some fallouts of moving test servers around. in file:///home/vila/src/bzr/cleanup/test-servers/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5023
revision-id: v.ladeuil+lp at free.fr-20100209171801-itzyi0ah1ywri49v
parent: v.ladeuil+lp at free.fr-20100209171517-1wzz1nh3d3nhnkbu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 18:18:01 +0100
message:
  Fix some fallouts of moving test servers around.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-02-05 12:13:07 +0000
+++ b/bzrlib/tests/__init__.py	2010-02-09 17:18:01 +0000
@@ -103,11 +103,11 @@
 import bzrlib.trace
 from bzrlib.transport import get_transport, pathfilter
 import bzrlib.transport
-from bzrlib.transport.local import LocalURLServer
-from bzrlib.transport.memory import MemoryServer
-from bzrlib.transport.readonly import ReadonlyServer
 from bzrlib.trace import mutter, note
-from bzrlib.tests import TestUtil
+from bzrlib.tests import (
+    test_server,
+    TestUtil,
+    )
 from bzrlib.tests.http_server import HttpServer
 from bzrlib.tests.TestUtil import (
                           TestSuite,
@@ -124,7 +124,7 @@
 # shown frame is the test code, not our assertXYZ.
 __unittest = 1
 
-default_transport = LocalURLServer
+default_transport = test_server.LocalURLServer
 
 
 _unitialized_attr = object()
@@ -2175,7 +2175,7 @@
         if self.__readonly_server is None:
             if self.transport_readonly_server is None:
                 # readonly decorator requested
-                self.__readonly_server = ReadonlyServer()
+                self.__readonly_server = test_serevr.ReadonlyServer()
             else:
                 # explicit readonly transport.
                 self.__readonly_server = self.create_transport_readonly_server()
@@ -2204,7 +2204,7 @@
         is no means to override it.
         """
         if self.__vfs_server is None:
-            self.__vfs_server = MemoryServer()
+            self.__vfs_server = test_server.MemoryServer()
             self.start_server(self.__vfs_server)
         return self.__vfs_server
 
@@ -2619,7 +2619,7 @@
             # We can only make working trees locally at the moment.  If the
             # transport can't support them, then we keep the non-disk-backed
             # branch and create a local checkout.
-            if self.vfs_transport_factory is LocalURLServer:
+            if self.vfs_transport_factory is test_server.LocalURLServer:
                 # the branch is colocated on disk, we cannot create a checkout.
                 # hopefully callers will expect this.
                 local_controldir= bzrdir.BzrDir.open(self.get_vfs_only_url(relpath))
@@ -2685,7 +2685,7 @@
 
     def setUp(self):
         super(ChrootedTestCase, self).setUp()
-        if not self.vfs_transport_factory == MemoryServer:
+        if not self.vfs_transport_factory == test_server.MemoryServer:
             self.transport_readonly_server = HttpServer
 
 

=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-02-09 17:15:17 +0000
+++ b/bzrlib/tests/test_server.py	2010-02-09 17:18:01 +0000
@@ -53,7 +53,7 @@
         raise NotImplementedError
 
 
-class LocalURLServer(Server):
+class LocalURLServer(TestServer):
     """A pretend server for local transports, using file:// urls.
 
     Of course no actual server is required to access the local filesystem, so
@@ -68,7 +68,7 @@
         return urlutils.local_path_to_url('')
 
 
-class MemoryServer(Server):
+class MemoryServer(TestServer):
     """Server for the MemoryTransport for testing with."""
 
     def start_server(self):
@@ -95,7 +95,7 @@
         return self._scheme
 
 
-class DecoratorServer(Server):
+class DecoratorServer(TestServer):
     """Server for the TransportDecorator for testing with.
 
     To use this when subclassing TransportDecorator, override override the