Rev 2383: Make the HTTPTestServer setup be safer about ignoring the backing_transport_server. in file:///home/robertc/source/baz/hpss-test-correctness/

[Robert Collins]

At file:///home/robertc/source/baz/hpss-test-correctness/

------------------------------------------------------------
revno: 2383
revision-id: robertc at robertcollins.net-20070328124707-222o5nwhvtoexk2c
parent: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Wed 2007-03-28 22:47:07 +1000
message:
  Make the HTTPTestServer setup be safer about ignoring the backing_transport_server.
modified:
  bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
=== modified file 'bzrlib/tests/HttpServer.py'
--- a/bzrlib/tests/HttpServer.py	2007-03-28 07:33:07 +0000
+++ b/bzrlib/tests/HttpServer.py	2007-03-28 12:47:07 +0000
@@ -29,6 +29,7 @@
 import urlparse
 
 from bzrlib.transport import Server
+from bzrlib.transport.local import LocalURLServer
 
 
 class WebserverNotAvailable(Exception):
@@ -304,13 +305,18 @@
         """Capture Server log output."""
         self.logs.append(format % args)
 
-    def setUp(self, decorated_transport=None):
+    def setUp(self, backing_transport_server=None):
         """See bzrlib.transport.Server.setUp.
         
-        :param decorated_transport: The transport that requests over this
+        :param backing_transport_server: The transport that requests over this
             protocol should be forwarded to. Note that this is currently not
             supported for HTTP - it is ignored.
         """
+        # XXX: TODO: make sftpserver back onto vfs_server rather than local disk.
+        assert backing_transport_server is None or \
+            isinstance(backing_transport_server, LocalURLServer), \
+            "SFTPServer currently assumes local transport, got %s" % \
+            backing_transport_server
         self._home_dir = os.getcwdu()
         self._local_path_parts = self._home_dir.split(os.path.sep)
         self._http_starting = threading.Lock()