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

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5051
revision-id: v.ladeuil+lp at free.fr-20100209212017-9l673ydgivrtbcam
parent: v.ladeuil+lp at free.fr-20100209211727-594kfko33hoxiz3y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:20:17 +0100
message:
  -s bt.per_branch passing
-------------- next part --------------
=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-02-03 14:08:55 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-02-09 21:20:17 +0000
@@ -33,10 +33,10 @@
     urlutils,
     )
 from bzrlib.transport import (
-    local,
-    Server,
     ssh,
     )
+from bzrlib.tests import test_server
+
 
 class StubServer (paramiko.ServerInterface):
 
@@ -382,7 +382,7 @@
         return bytes_sent
 
 
-class SFTPServer(Server):
+class SFTPServer(test_server.TestServer):
     """Common code for SFTP server facilities."""
 
     def __init__(self, server_interface=StubServer):
@@ -436,7 +436,7 @@
         # XXX: TODO: make sftpserver back onto backing_server rather than local
         # disk.
         if not (backing_server is None or
-                isinstance(backing_server, local.LocalURLServer)):
+                isinstance(backing_server, test_server.LocalURLServer)):
             raise AssertionError(
                 "backing_server should not be %r, because this can only serve the "
                 "local current working directory." % (backing_server,))