Merge lp:~vila/bzr/move-test-servers into lp:bzr

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

This patch moves test servers out of the bzrlib.transport hierarchy
to bzrlib.test.test_server and all related fallouts.

It spun off bug #516183 (testools required for sftp use) to make
sure we don't run into similar problems with other transports.

It's quite big but mostly mechanical.

Given that I relied on the test suite, I don't expect a lot of fallouts.

Some plugins may break if they relied on bzrlib.transport.Server but the fix
will be trivial anyway.

They should be fine if they use our ftp or http servers though.

This patch may be easier to review commit by commit rather than as a whole...

[John A Meinel (jameinel)]

This change looks ok except:

1) I expect it will cause some significant fallout with Launchpad and possibly some plugins.
2) We should make sure to have a nice big NEWS entry about how to update your code. It looks mostly like just importing 'test_server' and using whatever server you were using previously. (I would expect MemoryServer to be the only one causing problems.)

I wonder if we should just leave in a deprecated thunk for MemoryServer...

3) We should probably try to coordinate with someone like MWH for (1).

review: Approve

[Andrew Bennetts (spiv)]

John A Meinel wrote:
> Review: Approve
> This change looks ok except:
>
> 1) I expect it will cause some significant fallout with Launchpad and possibly some plugins.
> 2) We should make sure to have a nice big NEWS entry about how to update your code. It looks mostly like just importing 'test_server' and using whatever server you were using previously. (I would expect MemoryServer to be the only one causing problems.)
>
> I wonder if we should just leave in a deprecated thunk for MemoryServer...

I think MemoryServer is useful for more than just testing, so I think it should
stay in bzrlib.transport.memory. It's useful for constructing a virtual
filesystem, e.g. Launchpad uses it in non-test code for the automatic bzrdirs
with stacking directives.

This implies to me that the Server base class should remain in bzrlib.transport
too.

[Robert Collins (lifeless)]

On Wed, 2010-02-10 at 23:51 +0000, Andrew Bennetts wrote:
>
> I think MemoryServer is useful for more than just testing, so I think
> it should
> stay in bzrlib.transport.memory. It's useful for constructing a
> virtual
> filesystem, e.g. Launchpad uses it in non-test code for the automatic
> bzrdirs
> with stacking directives.
>
> This implies to me that the Server base class should remain in
> bzrlib.transport
> too.

I agree with this. I'll go further and say that *most* of our servers
are really quite useful for non-test code. I don't think they should
move under tests at all.

I think the following *should* move under tests:
 - servers that are unsafe to use outside of tests
 - servers that are deliberately broken (and thus their raison d'etre is
for testing)

And these *could* move under tests:
 - the mapping of 'To test transport T use servers A, B and C'

-Rob

[Martin Pool (mbp)]

On 11 February 2010 12:48, Robert Collins <email address hidden> wrote:
> On Wed, 2010-02-10 at 23:51 +0000, Andrew Bennetts wrote:
>>
>> I think MemoryServer is useful for more than just testing, so I think
>> it should
>> stay in bzrlib.transport.memory.  It's useful for constructing a
>> virtual
>> filesystem, e.g. Launchpad uses it in non-test code for the automatic
>> bzrdirs
>> with stacking directives.
>>
>> This implies to me that the Server base class should remain in
>> bzrlib.transport
>> too.
>
> I agree with this. I'll go further and say that *most* of our servers
> are really quite useful for non-test code.  I don't think they should
> move under tests at all.
>
> I think the following *should* move under tests:
>  - servers that are unsafe to use outside of tests
>  - servers that are deliberately broken (and thus their raison d'etre is
> for testing)
>
> And these *could* move under tests:
>  - the mapping of 'To test transport T use servers A, B and C'

Perhaps we should move them all to bzrlib.servers. Then we can assert
that module is not loaded when it is not needed, and we can allow for
currently limited servers to grow into being more generally useful. I
think we have some intentionally limited transports in b.transport and
I don't see that as essentially problematic. It's more important that
the class name make its limitations clear.

--
Martin <http://launchpad.net/~mbp/>

[Robert Collins (lifeless)]

On Thu, 2010-02-11 at 01:54 +0000, Martin Pool wrote:
>
>
> Perhaps we should move them all to bzrlib.servers. Then we can assert
> that module is not loaded when it is not needed, and we can allow for
> currently limited servers to grow into being more generally useful. I
> think we have some intentionally limited transports in b.transport and
> I don't see that as essentially problematic. It's more important that
> the class name make its limitations clear.

This sounds fine to me too.

Perhaps bzrlib.transport.servers.* ?

-Rob

[Martin Pool (mbp)]

On 11 February 2010 13:42, Robert Collins <email address hidden> wrote:
> On Thu, 2010-02-11 at 01:54 +0000, Martin Pool wrote:
>>
>>
>> Perhaps we should move them all to bzrlib.servers.  Then we can assert
>> that module is not loaded when it is not needed, and we can allow for
>> currently limited servers to grow into being more generally useful.  I
>> think we have some intentionally limited transports in b.transport and
>> I don't see that as essentially problematic.  It's more important that
>> the class name make its limitations clear.
>
> This sounds fine to me too.
>
> Perhaps bzrlib.transport.servers.* ?

I'd slightly prefer .servers:

1- submodules seem to occasionally cause more annoying python import
behaviour (circularity etc) than sibling modules
2- bzrlib.transport.servers seems a bit longwinded

--
Martin <http://launchpad.net/~mbp/>

[Robert Collins (lifeless)]

On Thu, 2010-02-11 at 02:51 +0000, Martin Pool wrote:
>
> > Perhaps bzrlib.transport.servers.* ?
>
> I'd slightly prefer .servers:
>
> 1- submodules seem to occasionally cause more annoying python import
> behaviour (circularity etc) than sibling modules

Could you enlarge on this? I haven't seen that, unless you mean the
behaviour of 'import foo' in a submodule trying for
'parent.thispackage.foo' first, rather than 'foo.' (the top level foo).
This should be pretty fast after it is tried once, because after that
the dentry cache is hot.

> 2- bzrlib.transport.servers seems a bit longwinded

I proposed transport.servers because:
 - They are specifically transport servers, not smart server servers, or
git servers, or CVS servers; and I wouldn't really want to see a git
server mixed in. I guess we could do servers.transports.*, but thats
equally long winded, and IMO less clear.
 - I see the transport servers as being generally coupled to transports,
not coupled to bzrlib as a whole.

That said, its up to whomever proposes the patch :)

-Rob

[Martin Pool (mbp)]

On 11 February 2010 14:06, Robert Collins <email address hidden> wrote:
> On Thu, 2010-02-11 at 02:51 +0000, Martin Pool wrote:
>>
>> > Perhaps bzrlib.transport.servers.* ?
>>
>> I'd slightly prefer .servers:
>>
>> 1- submodules seem to occasionally cause more annoying python import
>> behaviour (circularity etc) than sibling modules
>
> Could you enlarge on this? I haven't seen that, unless you mean the
> behaviour of 'import foo' in a submodule trying for
> 'parent.thispackage.foo' first, rather than 'foo.' (the top level foo).
> This should be pretty fast after it is tried once, because after that
> the dentry cache is hot.

You can't do 'import bzrlib.ui.text' in top-level code in 'bzrlib.ui'.

>> 2- bzrlib.transport.servers seems a bit longwinded
>
> I proposed transport.servers because:
>  - They are specifically transport servers, not smart server servers, or
> git servers, or CVS servers; and I wouldn't really want to see a git
> server mixed in. I guess we could do servers.transports.*, but thats
> equally long winded, and IMO less clear.

Are they really? They are things that can be started, stopped, and
that have a URL. Their essentially connection to transports (as
opposed to the fact that they are only used for testing transports)
seems quite weak.

I would be ok with having bzrlib.server.ftp alongside
bzrlib.server.git for example.

>  - I see the transport servers as being generally coupled to transports,
> not coupled to bzrlib as a whole.
>
> That said, its up to whomever proposes the patch :)

--
Martin <http://launchpad.net/~mbp/>

[Robert Collins (lifeless)]

On Thu, 2010-02-11 at 03:45 +0000, Martin Pool wrote:
> On 11 February 2010 14:06, Robert Collins <email address hidden> wrote:
> > On Thu, 2010-02-11 at 02:51 +0000, Martin Pool wrote:
> >>
> >> > Perhaps bzrlib.transport.servers.* ?
> >>
> >> I'd slightly prefer .servers:
> >>
> >> 1- submodules seem to occasionally cause more annoying python import
> >> behaviour (circularity etc) than sibling modules
> >
> > Could you enlarge on this? I haven't seen that, unless you mean the
> > behaviour of 'import foo' in a submodule trying for
> > 'parent.thispackage.foo' first, rather than 'foo.' (the top level foo).
> > This should be pretty fast after it is tried once, because after that
> > the dentry cache is hot.
>
> You can't do 'import bzrlib.ui.text' in top-level code in 'bzrlib.ui'.

Thats true. That doesn't seem to apply here though, does it? I don't
think we should shun all subpackages and submodules because that can
happen. In fact, its the case in all imports that you can't import from
within the currently importing package at the top level - this is why
circular imports are a problem. bzrlib.servers seems no more or less
inclined to suffer this than bzrlib.transport.servers, as in neither
case do we seem to have an a-priori need to expose things from within
the namespace.

> >> 2- bzrlib.transport.servers seems a bit longwinded
> >
> > I proposed transport.servers because:
> > - They are specifically transport servers, not smart server servers, or
> > git servers, or CVS servers; and I wouldn't really want to see a git
> > server mixed in. I guess we could do servers.transports.*, but thats
> > equally long winded, and IMO less clear.
>
> Are they really? They are things that can be started, stopped, and
> that have a URL. Their essentially connection to transports (as
> opposed to the fact that they are only used for testing transports)
> seems quite weak.

They are all servers for VFS's, rather than servers for non-FS-like file
systems.

-Rob

[Vincent Ladeuil (vila)]

Cough, so to clear up a few points:
- bzrlib.transport.Server still exists
- only chroot and pathfilter are really used as servers,
- there is still various grey areas around inheriting from
  b.t.Server or just implementing {start|stop}_server(), and yes
  get_url() is only used for tests,
- I expect most fallouts from LocalUrlServer and to a lesser
  extent MemoryServer (if the bzr code base usage can serve
  as a comparison point),
- given the above, only *tests* should be failing from there.

Also, I first started to deprecate b.t.Server and it helped me
find all obscure usages, but in the end I had to leave it alone to
separate "real" server usages (chroot and pathfilter) from true test
usages. And since a server is just implementing {start|stop}_server()
I already wondered if it wasn't already too much (or said otherwise
a small enough API to not even bother having a base class for it, which
is exactly what smart_server does).

About starting a bzrlib.transport.servers a bzrlib.servers hierarchy:
- YAGNI,
- a slight preference for bzrlib.servers when needed but so far,
  I don't even consider our ftp and http servers like true servers.
  Their intent is to be hacked on to be able to test any crazy
  failure mode. As such, if there is ever a decision needed to be
  made between making them easy to customize or making them faster,
  I will chose the former.

I'll add a NEWS entry explaining the migration path (mostly,
as John said changing an import). Since the fix is trivial,
I don't think we need to make an exception for launchpad
(which may already have other API skews to fix).

Since it has been approved, I'll land that patch which is already
massive and we can improve from there.

[Vincent Ladeuil (vila)]

I forgot to mention that I've put all test servers into
bzrlib.test.test_server because they looked trivial enough
to not need their own dedicated server.

Semy-arbitrarily I left the ftp and http servers out of that
because they needed a bit more code.

The smart servers for testing for a bit between the two but
they needed to leave the bzrlib.transport hierarchy because
they were intended for *test*.

[lp:~vila/bzr/move-test-servers]

5062. By Vincent Ladeuil on 2010-02-11

Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

5063. By Vincent Ladeuil on 2010-02-11

Update NEWS entry.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...
>>>> 2- bzrlib.transport.servers seems a bit longwinded
>>> I proposed transport.servers because:
>>> - They are specifically transport servers, not smart server servers, or
>>> git servers, or CVS servers; and I wouldn't really want to see a git
>>> server mixed in. I guess we could do servers.transports.*, but thats
>>> equally long winded, and IMO less clear.
>> Are they really? They are things that can be started, stopped, and
>> that have a URL. Their essentially connection to transports (as
>> opposed to the fact that they are only used for testing transports)
>> seems quite weak.
>
> They are all servers for VFS's, rather than servers for non-FS-like file
> systems.
>
> -Rob
>

Just to mention that the whole reason this was brought up at all, is
because the SftpServer implementation depended on something in
'bzrlib.tests' which caused a *runtime* dependency for sftp to require
having 'testtools' installed.

If these servers require 'bzrlib.tests' to be available, that certainly
seems like it belongs as 'test_servers'. (If you can't really use them
without loading the testing infrastructure.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkt0GfgACgkQJdeBCYSNAAN34gCeNGiEfnLScEzhq1cBq0oKY13k
MfYAnifbuaB2Yxa9X84U4yMwIukLDgoA
=asMl
-----END PGP SIGNATURE-----

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...

> I'll add a NEWS entry explaining the migration path (mostly,
> as John said changing an import). Since the fix is trivial,
> I don't think we need to make an exception for launchpad
> (which may already have other API skews to fix).
>
> Since it has been approved, I'll land that patch which is already
> massive and we can improve from there.
>
>

I would probably make sure to do something about MemoryServer, as that
is likely to actually impact 3rd-party code. The rest can be debated ad
nauseum.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkt0GlcACgkQJdeBCYSNAAObkwCfcMuiMwtvY85/vE2RKYQqrNUD
cVQAn1pgkeERuoCCr5PyJpby8t971lLp
=QGYJ
-----END PGP SIGNATURE-----

[Vincent Ladeuil (vila)]

>>>>> "jam" == John A Meinel <email address hidden> writes:

<snip/>

    jam> I would probably make sure to do something about MemoryServer, as that
    jam> is likely to actually impact 3rd-party code. The rest can be debated ad
    jam> nauseum.

I fixed that before landing after discussing it on IRC.

So MemoryServer is still bzrlib.transport.memory if only because
you can't use a Memory Transport without it.

  Vincent

=== modified file 'NEWS'
--- NEWS	2010-02-11 06:15:33 +0000
+++ NEWS	2010-02-11 09:31:16 +0000
@@ -20,6 +20,13 @@
 
 * ``Repository.get_inventory_sha1()`` has been removed. (Jelmer Vernooij)
 
+* All test servers have been moved out of the bzrlib.transport hierarchy to
+  bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
+  PathFilteringServer. ``bzrlib`` users may encounter test failures that can
+  be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
+  ``bzrlib.tests.test_server``.
+  (Vincent Ladeuil)
+
 New Features
 ************
 

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-02-11 05:43:31 +0000
+++ bzrlib/builtins.py	2010-02-11 09:31:16 +0000
@@ -54,6 +54,7 @@
     )
 from bzrlib.branch import Branch
 from bzrlib.conflicts import ConflictList
+from bzrlib.transport import memory
 from bzrlib.revisionspec import RevisionSpec, RevisionInfo
 from bzrlib.smtp_connection import SMTPConnection
 from bzrlib.workingtree import WorkingTree
@@ -3444,11 +3445,11 @@
             from bzrlib.tests import stub_sftp
             return stub_sftp.SFTPAbsoluteServer
         if typestring == "memory":
-            from bzrlib.transport.memory import MemoryServer
-            return MemoryServer
+            from bzrlib.tests import test_server
+            return memory.MemoryServer
         if typestring == "fakenfs":
-            from bzrlib.transport.fakenfs import FakeNFSServer
-            return FakeNFSServer
+            from bzrlib.tests import test_server
+            return test_server.FakeNFSServer
         msg = "No known transport type %s. Supported types are: sftp\n" %\
             (typestring)
         raise errors.BzrCommandError(msg)

=== modified file 'bzrlib/smart/server.py'
--- bzrlib/smart/server.py	2010-01-07 03:03:01 +0000
+++ bzrlib/smart/server.py	2010-02-11 09:31:16 +0000
@@ -236,91 +236,6 @@
 SmartTCPServer.hooks = SmartServerHooks()
 
 
-class SmartTCPServer_for_testing(SmartTCPServer):
-    """Server suitable for use by transport tests.
-
-    This server is backed by the process's cwd.
-    """
-
-    def __init__(self, thread_name_suffix=''):
-        SmartTCPServer.__init__(self, None)
-        self.client_path_extra = None
-        self.thread_name_suffix = thread_name_suffix
-
-    def get_backing_transport(self, backing_transport_server):
-        """Get a backing transport from a server we are decorating."""
-        return transport.get_transport(backing_transport_server.get_url())
-
-    def start_server(self, backing_transport_server=None,
-              client_path_extra='/extra/'):
-        """Set up server for testing.
-
-        :param backing_transport_server: backing server to use.  If not
-            specified, a LocalURLServer at the current working directory will
-            be used.
-        :param client_path_extra: a path segment starting with '/' to append to
-            the root URL for this server.  For instance, a value of '/foo/bar/'
-            will mean the root of the backing transport will be published at a
-            URL like `bzr://127.0.0.1:nnnn/foo/bar/`, rather than
-            `bzr://127.0.0.1:nnnn/`.  Default value is `extra`, so that tests
-            by default will fail unless they do the necessary path translation.
-        """
-        if not client_path_extra.startswith('/'):
-            raise ValueError(client_path_extra)
-        from bzrlib.transport.chroot import ChrootServer
-        if backing_transport_server is None:
-            from bzrlib.transport.local import LocalURLServer
-            backing_transport_server = LocalURLServer()
-        self.chroot_server = ChrootServer(
-            self.get_backing_transport(backing_transport_server))
-        self.chroot_server.start_server()
-        self.backing_transport = transport.get_transport(
-            self.chroot_server.get_url())
-        self.root_client_path = self.client_path_extra = client_path_extra
-        self.start_background_thread(self.thread_name_suffix)
-
-    def stop_server(self):
-        self.stop_background_thread()
-        self.chroot_server.stop_server()
-
-    def get_url(self):
-        url = super(SmartTCPServer_for_testing, self).get_url()
-        return url[:-1] + self.client_path_extra
-
-    def get_bogus_url(self):
-        """Return a URL which will fail to connect"""
-        return 'bzr://127.0.0.1:1/'
-
-
-class ReadonlySmartTCPServer_for_testing(SmartTCPServer_for_testing):
-    """Get a readonly server for testing."""
-
-    def get_backing_transport(self, backing_transport_server):
-        """Get a backing transport from a server we are decorating."""
-        url = 'readonly+' + backing_transport_server.get_url()
-        return transport.get_transport(url)
-
-
-class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
-    """A variation of SmartTCPServer_for_testing that limits the client to
-    using RPCs in protocol v2 (i.e. bzr <= 1.5).
-    """
-
-    def get_url(self):
-        url = super(SmartTCPServer_for_testing_v2_only, self).get_url()
-        url = 'bzr-v2://' + url[len('bzr://'):]
-        return url
-
-
-class ReadonlySmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing_v2_only):
-    """Get a readonly server for testing."""
-
-    def get_backing_transport(self, backing_transport_server):
-        """Get a backing transport from a server we are decorating."""
-        url = 'readonly+' + backing_transport_server.get_url()
-        return transport.get_transport(url)
-
-
 def _local_path_for_transport(transport):
     """Return a local path for transport, if reasonably possible.
     

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-02-11 04:02:41 +0000
+++ bzrlib/tests/__init__.py	2010-02-11 09:31:16 +0000
@@ -101,13 +101,17 @@
     deprecated_passed,
     )
 import bzrlib.trace
-from bzrlib.transport import get_transport, pathfilter
+from bzrlib.transport import (
+    get_transport,
+    memory,
+    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 +128,7 @@
 # shown frame is the test code, not our assertXYZ.
 __unittest = 1
 
-default_transport = LocalURLServer
+default_transport = test_server.LocalURLServer
 
 
 _unitialized_attr = object()
@@ -1040,7 +1044,8 @@
         if t.base.endswith('/work/'):
             # we have safety net/test root/work
             t = t.clone('../..')
-        elif isinstance(transport_server, server.SmartTCPServer_for_testing):
+        elif isinstance(transport_server,
+                        test_server.SmartTCPServer_for_testing):
             # The smart server adds a path similar to work, which is traversed
             # up from by the client. But the server is chrooted - the actual
             # backing transport is not escaped from, and VFS requests to the
@@ -2175,7 +2180,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_server.ReadonlyServer()
             else:
                 # explicit readonly transport.
                 self.__readonly_server = self.create_transport_readonly_server()
@@ -2204,7 +2209,7 @@
         is no means to override it.
         """
         if self.__vfs_server is None:
-            self.__vfs_server = MemoryServer()
+            self.__vfs_server = memory.MemoryServer()
             self.start_server(self.__vfs_server)
         return self.__vfs_server
 
@@ -2367,7 +2372,7 @@
         return made_control.create_repository(shared=shared)
 
     def make_smart_server(self, path):
-        smart_server = server.SmartTCPServer_for_testing()
+        smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(smart_server, self.get_server())
         remote_transport = get_transport(smart_server.get_url()).clone(path)
         return remote_transport
@@ -2400,7 +2405,7 @@
 
     def setup_smart_server_with_call_log(self):
         """Sets up a smart server as the transport server with a call log."""
-        self.transport_server = server.SmartTCPServer_for_testing
+        self.transport_server = test_server.SmartTCPServer_for_testing
         self.hpss_calls = []
         import traceback
         # Skip the current stack down to the caller of
@@ -2619,7 +2624,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 +2690,7 @@
 
     def setUp(self):
         super(ChrootedTestCase, self).setUp()
-        if not self.vfs_transport_factory == MemoryServer:
+        if not self.vfs_transport_factory == memory.MemoryServer:
             self.transport_readonly_server = HttpServer
 
 

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- bzrlib/tests/blackbox/test_branch.py	2010-01-12 06:39:06 +0000
+++ bzrlib/tests/blackbox/test_branch.py	2010-02-11 09:31:16 +0000
@@ -31,6 +31,7 @@
 from bzrlib.tests import (
     KnownFailure,
     HardlinkFeature,
+    test_server,
     )
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
@@ -308,8 +309,7 @@
 
     def test_branch_stacked_from_smart_server(self):
         # We can branch stacking on a smart server
-        from bzrlib.smart.server import SmartTCPServer_for_testing
-        self.transport_server = SmartTCPServer_for_testing
+        self.transport_server = test_server.SmartTCPServer_for_testing
         trunk = self.make_branch('mainline', format='1.9')
         out, err = self.run_bzr(
             ['branch', '--stacked', self.get_url('mainline'), 'shallow'])

=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- bzrlib/tests/blackbox/test_cat.py	2010-01-12 07:02:54 +0000
+++ bzrlib/tests/blackbox/test_cat.py	2010-02-11 09:31:16 +0000
@@ -22,6 +22,7 @@
 import os
 
 from bzrlib import tests
+from bzrlib.transport import memory
 
 
 class TestCat(tests.TestCaseWithTransport):
@@ -195,6 +196,6 @@
         self.assertEqual('contents of README\n', out)
 
     def test_cat_nonexistent_branch(self):
-        self.vfs_transport_factory = tests.MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
         self.run_bzr_error(['^bzr: ERROR: Not a branch'],
                            ['cat', self.get_url()])

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- bzrlib/tests/blackbox/test_info.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/blackbox/test_info.py	2010-02-11 09:31:16 +0000
@@ -31,6 +31,7 @@
     )
 from bzrlib.transport import memory
 
+
 class TestInfo(tests.TestCaseWithTransport):
 
     def setUp(self):

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2010-01-07 03:03:01 +0000
+++ bzrlib/tests/blackbox/test_push.py	2010-02-11 09:31:16 +0000
@@ -35,6 +35,7 @@
     blackbox,
     http_server,
     test_foreign,
+    test_server,
     )
 from bzrlib.transport import memory
 

=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- bzrlib/tests/blackbox/test_selftest.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/blackbox/test_selftest.py	2010-02-11 09:31:16 +0000
@@ -24,7 +24,7 @@
     features,
     stub_sftp,
     )
-
+from bzrlib.transport import memory
 
 class SelfTestPatch:
 
@@ -82,10 +82,8 @@
     def test_transport_set_to_memory(self):
         # Test that we can pass a transport to the selftest core - memory
         # version.
-        import bzrlib.transport.memory
         params = self.get_params_passed_to_core('selftest --transport=memory')
-        self.assertEqual(bzrlib.transport.memory.MemoryServer,
-            params[1]["transport"])
+        self.assertEqual(memory.MemoryServer, params[1]["transport"])
 
     def test_parameters_passed_to_core(self):
         params = self.get_params_passed_to_core('selftest --list-only')

=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- bzrlib/tests/blackbox/test_send.py	2009-11-28 00:48:03 +0000
+++ bzrlib/tests/blackbox/test_send.py	2010-02-11 09:31:16 +0000
@@ -26,6 +26,7 @@
     tests,
     )
 from bzrlib.bundle import serializer
+from bzrlib.transport import memory
 
 
 def load_tests(standard_tests, module, loader):
@@ -280,7 +281,7 @@
         self.assertEqual('rev3', md.revision_id)
 
     def test_nonexistant_branch(self):
-        self.vfs_transport_factory = tests.MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
         location = self.get_url('absentdir/')
         out, err = self.run_bzr(["send", "--from", location], retcode=3)
         self.assertEqual(out, '')

=== modified file 'bzrlib/tests/ftp_server/medusa_based.py'
--- bzrlib/tests/ftp_server/medusa_based.py	2010-01-08 03:35:09 +0000
+++ bzrlib/tests/ftp_server/medusa_based.py	2010-02-11 09:31:16 +0000
@@ -33,8 +33,8 @@
 from bzrlib import (
     tests,
     trace,
-    transport,
     )
+from bzrlib.tests import test_server
 
 
 class test_filesystem(medusa.filesys.os_filesystem):
@@ -210,7 +210,7 @@
         trace.mutter('ftp_server %s: %s', type, message)
 
 
-class FTPTestServer(transport.Server):
+class FTPTestServer(test_server.TestServer):
     """Common code for FTP server facilities."""
 
     no_unicode_support = True
@@ -236,8 +236,8 @@
         self.logs.append(message)
 
     def start_server(self, vfs_server=None):
-        from bzrlib.transport.local import LocalURLServer
-        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
+        if not (vfs_server is None or isinstance(vfs_server,
+                                                 test_server.LocalURLServer)):
             raise AssertionError(
                 "FTPServer currently assumes local transport, got %s" % vfs_server)
         self._root = os.getcwdu()

=== modified file 'bzrlib/tests/ftp_server/pyftpdlib_based.py'
--- bzrlib/tests/ftp_server/pyftpdlib_based.py	2010-01-13 15:30:22 +0000
+++ bzrlib/tests/ftp_server/pyftpdlib_based.py	2010-02-11 09:31:16 +0000
@@ -29,8 +29,8 @@
 from bzrlib import (
     osutils,
     trace,
-    transport,
     )
+from bzrlib.tests import test_server
 
 
 class AnonymousWithWriteAccessAuthorizer(ftpserver.DummyAuthorizer):
@@ -133,7 +133,7 @@
         self.addr = self.socket.getsockname()
 
 
-class FTPTestServer(transport.Server):
+class FTPTestServer(test_server.TestServer):
     """Common code for FTP server facilities."""
 
     def __init__(self):
@@ -158,8 +158,8 @@
         self.logs.append(message)
 
     def start_server(self, vfs_server=None):
-        from bzrlib.transport.local import LocalURLServer
-        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
+        if not (vfs_server is None or isinstance(vfs_server,
+                                                 test_server.LocalURLServer)):
             raise AssertionError(
                 "FTPServer currently assumes local transport, got %s"
                 % vfs_server)

=== modified file 'bzrlib/tests/http_server.py'
--- bzrlib/tests/http_server.py	2010-01-07 03:03:01 +0000
+++ bzrlib/tests/http_server.py	2010-02-11 09:31:16 +0000
@@ -31,6 +31,7 @@
 import urlparse
 
 from bzrlib import transport
+from bzrlib.tests import test_server
 from bzrlib.transport import local
 
 
@@ -530,8 +531,9 @@
         """
         # XXX: TODO: make the server back onto vfs_server rather than local
         # disk.
-        if not (backing_transport_server is None or \
-                isinstance(backing_transport_server, local.LocalURLServer)):
+        if not (backing_transport_server is None
+                or isinstance(backing_transport_server,
+                              test_server.LocalURLServer)):
             raise AssertionError(
                 "HTTPServer currently assumes local transport, got %s" % \
                 backing_transport_server)

=== modified file 'bzrlib/tests/per_branch/__init__.py'
--- bzrlib/tests/per_branch/__init__.py	2009-08-17 06:17:21 +0000
+++ bzrlib/tests/per_branch/__init__.py	2010-02-11 09:31:16 +0000
@@ -32,14 +32,9 @@
                            _legacy_formats,
                            )
 from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
-from bzrlib.smart.server import (
-    ReadonlySmartTCPServer_for_testing,
-    ReadonlySmartTCPServer_for_testing_v2_only,
-    SmartTCPServer_for_testing,
-    SmartTCPServer_for_testing_v2_only,
-    )
+from bzrlib.tests import test_server
 from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
-from bzrlib.transport.memory import MemoryServer
+from bzrlib.transport import memory
 
 
 def make_scenarios(transport_server, transport_readonly_server,
@@ -148,18 +143,18 @@
     # Add RemoteBranch tests, which need a special server.
     remote_branch_format = RemoteBranchFormat()
     scenarios.extend(make_scenarios(
-        SmartTCPServer_for_testing,
-        ReadonlySmartTCPServer_for_testing,
+        test_server.SmartTCPServer_for_testing,
+        test_server.ReadonlySmartTCPServer_for_testing,
         [(remote_branch_format, remote_branch_format._matchingbzrdir)],
-        MemoryServer,
+        memory.MemoryServer,
         name_suffix='-default'))
     # Also add tests for RemoteBranch with HPSS protocol v2 (i.e. bzr <1.6)
     # server.
     scenarios.extend(make_scenarios(
-        SmartTCPServer_for_testing_v2_only,
-        ReadonlySmartTCPServer_for_testing_v2_only,
+        test_server.SmartTCPServer_for_testing_v2_only,
+        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
         [(remote_branch_format, remote_branch_format._matchingbzrdir)],
-        MemoryServer,
+        memory.MemoryServer,
         name_suffix='-v2'))
     return scenarios
 

=== modified file 'bzrlib/tests/per_branch/test_bound_sftp.py'
--- bzrlib/tests/per_branch/test_bound_sftp.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_branch/test_bound_sftp.py	2010-02-11 09:31:16 +0000
@@ -25,16 +25,16 @@
     errors,
     tests,
     )
-from bzrlib.transport.local import LocalURLServer
-from bzrlib.transport.memory import MemoryServer
+from bzrlib.tests import test_server
+from bzrlib.transport import memory
 
 
 class BoundSFTPBranch(tests.TestCaseWithTransport):
 
     def setUp(self):
         tests.TestCaseWithTransport.setUp(self)
-        self.vfs_transport_factory = MemoryServer
-        if self.transport_server is LocalURLServer:
+        self.vfs_transport_factory = memory.MemoryServer
+        if self.transport_server is test_server.LocalURLServer:
             self.transport_server = None
 
     def create_branches(self):

=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- bzrlib/tests/per_branch/test_branch.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_branch/test_branch.py	2010-02-11 09:31:16 +0000
@@ -37,7 +37,7 @@
     per_branch,
     )
 from bzrlib.tests.http_server import HttpServer
-from bzrlib.transport.memory import MemoryServer
+from bzrlib.transport import memory
 
 
 class TestTestCaseWithBranch(per_branch.TestCaseWithBranch):
@@ -512,7 +512,7 @@
 
     def setUp(self):
         super(ChrootedTests, self).setUp()
-        if not self.vfs_transport_factory == MemoryServer:
+        if not self.vfs_transport_factory == memory.MemoryServer:
             self.transport_readonly_server = HttpServer
 
     def test_open_containing(self):

=== modified file 'bzrlib/tests/per_branch/test_hooks.py'
--- bzrlib/tests/per_branch/test_hooks.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_branch/test_hooks.py	2010-02-11 09:31:16 +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)

=== modified file 'bzrlib/tests/per_branch/test_http.py'
--- bzrlib/tests/per_branch/test_http.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_branch/test_http.py	2010-02-11 09:31:16 +0000
@@ -20,10 +20,9 @@
     branch,
     errors,
     )
-from bzrlib.tests import per_branch
-from bzrlib.transport import (
-    chroot,
-    local,
+from bzrlib.tests import (
+    per_branch,
+    test_server,
     )
 
 
@@ -38,8 +37,8 @@
 
     def setUp(self):
         super(InaccessibleParentTests, self).setUp()
-        if self.transport_server in (local.LocalURLServer, None):
-            self.transport_readonly_server = chroot.TestingChrootServer
+        if self.transport_server in (test_server.LocalURLServer, None):
+            self.transport_readonly_server = test_server.TestingChrootServer
 
     def get_branch_with_invalid_parent(self):
         """Get a branch whose get_parent will raise InaccessibleParent."""

=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- bzrlib/tests/per_branch/test_push.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_branch/test_push.py	2010-02-11 09:31:16 +0000
@@ -38,8 +38,10 @@
     server,
     repository as _mod_smart_repo,
     )
-from bzrlib.tests import per_branch
-from bzrlib.transport import local
+from bzrlib.tests import (
+    per_branch,
+    test_server,
+    )
 
 
 class TestPush(per_branch.TestCaseWithBranch):
@@ -149,7 +151,7 @@
         try:
             tree = a_branch.bzrdir.create_workingtree()
         except errors.NotLocalUrl:
-            if self.vfs_transport_factory is local.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(
@@ -391,7 +393,7 @@
         super(EmptyPushSmartEffortTests, self).setUp()
         # Create a smart server that publishes whatever the backing VFS server
         # does.
-        self.smart_server = server.SmartTCPServer_for_testing()
+        self.smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(self.smart_server, self.get_server())
         # Make two empty branches, 'empty' and 'target'.
         self.empty_branch = self.make_branch('empty')

=== modified file 'bzrlib/tests/per_bzrdir/__init__.py'
--- bzrlib/tests/per_bzrdir/__init__.py	2009-07-10 06:45:04 +0000
+++ bzrlib/tests/per_bzrdir/__init__.py	2010-02-11 09:31:16 +0000
@@ -26,11 +26,12 @@
 
 from bzrlib.bzrdir import BzrDirFormat
 from bzrlib.tests import (
-                          default_transport,
-                          multiply_tests,
-                          TestCaseWithTransport,
-                          )
-from bzrlib.transport.memory import MemoryServer
+    default_transport,
+    multiply_tests,
+    test_server,
+    TestCaseWithTransport,
+    )
+from bzrlib.transport import memory
 
 
 def make_scenarios(vfs_factory, transport_server, transport_readonly_server,
@@ -88,26 +89,20 @@
         None,
         formats)
     # This will always add scenarios using the smart server.
-    from bzrlib.smart.server import (
-        ReadonlySmartTCPServer_for_testing,
-        ReadonlySmartTCPServer_for_testing_v2_only,
-        SmartTCPServer_for_testing,
-        SmartTCPServer_for_testing_v2_only,
-        )
     from bzrlib.remote import RemoteBzrDirFormat
     # test the remote server behaviour when backed with a MemoryTransport
     # Once for the current version
     scenarios.extend(make_scenarios(
-        MemoryServer,
-        SmartTCPServer_for_testing,
-        ReadonlySmartTCPServer_for_testing,
+        memory.MemoryServer,
+        test_server.SmartTCPServer_for_testing,
+        test_server.ReadonlySmartTCPServer_for_testing,
         [(RemoteBzrDirFormat())],
         name_suffix='-default'))
     # And once with < 1.6 - the 'v2' protocol.
     scenarios.extend(make_scenarios(
-        MemoryServer,
-        SmartTCPServer_for_testing_v2_only,
-        ReadonlySmartTCPServer_for_testing_v2_only,
+        memory.MemoryServer,
+        test_server.SmartTCPServer_for_testing_v2_only,
+        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
         [(RemoteBzrDirFormat())],
         name_suffix='-v2'))
     # add the tests for the sub modules

=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- bzrlib/tests/per_interbranch/test_push.py	2010-01-25 17:48:22 +0000
+++ bzrlib/tests/per_interbranch/test_push.py	2010-02-11 09:31:16 +0000
@@ -40,7 +40,7 @@
     TestCaseWithInterBranch,
     )
 from bzrlib.transport import get_transport
-from bzrlib.transport.local import LocalURLServer
+from bzrlib.tests import test_server
 
 
 # These tests are based on similar tests in 
@@ -155,7 +155,7 @@
         try:
             tree = a_branch.bzrdir.create_workingtree()
         except errors.NotLocalUrl:
-            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('repo/tree'))

=== modified file 'bzrlib/tests/per_pack_repository.py'
--- bzrlib/tests/per_pack_repository.py	2010-01-25 17:48:22 +0000
+++ bzrlib/tests/per_pack_repository.py	2010-02-11 09:31:16 +0000
@@ -45,7 +45,6 @@
 from bzrlib.repofmt.groupcompress_repo import RepositoryFormat2a
 from bzrlib.smart import (
     client,
-    server,
     )
 from bzrlib.tests import (
     TestCase,
@@ -54,10 +53,10 @@
     TestSkipped,
     )
 from bzrlib.transport import (
-    fakenfs,
+    get_transport,
     memory,
-    get_transport,
     )
+from bzrlib.tests import test_server
 from bzrlib.tests.per_repository import TestCaseWithRepository
 
 
@@ -240,7 +239,7 @@
 
     def test_commit_write_group_returns_new_pack_names(self):
         # This test doesn't need real disk.
-        self.vfs_transport_factory = tests.MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
         format = self.get_format()
         repo = self.make_repository('foo', format=format)
         repo.lock_write()
@@ -277,7 +276,7 @@
     def test_fail_obsolete_deletion(self):
         # failing to delete obsolete packs is not fatal
         format = self.get_format()
-        server = fakenfs.FakeNFSServer()
+        server = test_server.FakeNFSServer()
         self.start_server(server)
         transport = get_transport(server.get_url())
         bzrdir = self.get_format().initialize_on_transport(transport)
@@ -1068,7 +1067,7 @@
         super(TestSmartServerAutopack, self).setUp()
         # Create a smart server that publishes whatever the backing VFS server
         # does.
-        self.smart_server = server.SmartTCPServer_for_testing()
+        self.smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(self.smart_server, self.get_server())
         # Log all HPSS calls into self.hpss_calls.
         client._SmartClient.hooks.install_named_hook(

=== modified file 'bzrlib/tests/per_repository/__init__.py'
--- bzrlib/tests/per_repository/__init__.py	2009-07-22 17:22:06 +0000
+++ bzrlib/tests/per_repository/__init__.py	2010-02-11 09:31:16 +0000
@@ -32,19 +32,14 @@
     weaverepo,
     )
 from bzrlib.remote import RemoteBzrDirFormat, RemoteRepositoryFormat
-from bzrlib.smart.server import (
-    ReadonlySmartTCPServer_for_testing,
-    ReadonlySmartTCPServer_for_testing_v2_only,
-    SmartTCPServer_for_testing,
-    SmartTCPServer_for_testing_v2_only,
-    )
 from bzrlib.tests import (
-                          default_transport,
-                          multiply_scenarios,
-                          multiply_tests,
-                          )
+    default_transport,
+    multiply_scenarios,
+    multiply_tests,
+    test_server,
+    )
 from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
-from bzrlib.transport.memory import MemoryServer
+from bzrlib.transport import memory
 
 
 def formats_to_scenarios(formats, transport_server, transport_readonly_server,
@@ -91,14 +86,14 @@
         None)
     format_scenarios.extend(formats_to_scenarios(
         [('-default', RemoteRepositoryFormat())],
-        SmartTCPServer_for_testing,
-        ReadonlySmartTCPServer_for_testing,
-        MemoryServer))
+        test_server.SmartTCPServer_for_testing,
+        test_server.ReadonlySmartTCPServer_for_testing,
+        memory.MemoryServer))
     format_scenarios.extend(formats_to_scenarios(
         [('-v2', RemoteRepositoryFormat())],
-        SmartTCPServer_for_testing_v2_only,
-        ReadonlySmartTCPServer_for_testing_v2_only,
-        MemoryServer))
+        test_server.SmartTCPServer_for_testing_v2_only,
+        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
+        memory.MemoryServer))
     return format_scenarios
 
 

=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- bzrlib/tests/per_repository/test_repository.py	2010-02-10 19:20:57 +0000
+++ bzrlib/tests/per_repository/test_repository.py	2010-02-11 09:31:16 +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):
@@ -823,7 +824,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)
@@ -1295,7 +1296,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:

=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- bzrlib/tests/per_repository/test_write_group.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/per_repository/test_write_group.py	2010-02-11 09:31:16 +0000
@@ -29,8 +29,11 @@
     tests,
     versionedfile,
     )
-from bzrlib.transport import local, memory
-from bzrlib.tests import per_repository
+from bzrlib.tests import (
+    per_repository,
+    test_server,
+    )
+from bzrlib.transport import memory
 
 
 class TestWriteGroup(per_repository.TestCaseWithRepository):
@@ -114,7 +117,7 @@
         repo.unlock()
 
     def test_abort_write_group_does_not_raise_when_suppressed(self):
-        if self.transport_server is local.LocalURLServer:
+        if self.transport_server is test_server.LocalURLServer:
             self.transport_server = None
         self.vfs_transport_factory = memory.MemoryServer
         repo = self.make_repository('repo')

=== modified file 'bzrlib/tests/per_transport.py'
--- bzrlib/tests/per_transport.py	2010-01-07 16:27:12 +0000
+++ bzrlib/tests/per_transport.py	2010-02-11 09:31:16 +0000
@@ -52,6 +52,7 @@
     TestNotApplicable,
     multiply_tests,
     )
+from bzrlib.tests import test_server
 from bzrlib.tests.test_transport import TestTransportImplementation
 from bzrlib.transport import (
     ConnectedTransport,
@@ -170,8 +171,7 @@
         self.assertEqual(True, t.has_any(['b', 'b', 'b']))
 
     def test_has_root_works(self):
-        from bzrlib.smart import server
-        if self.transport_server is server.SmartTCPServer_for_testing:
+        if self.transport_server is test_server.SmartTCPServer_for_testing:
             raise TestNotApplicable(
                 "SmartTCPServer_for_testing intentionally does not allow "
                 "access to /.")

=== modified file 'bzrlib/tests/stub_sftp.py'
--- bzrlib/tests/stub_sftp.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/stub_sftp.py	2010-02-11 09:31:16 +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,))

=== modified file 'bzrlib/tests/test_bzrdir.py'
--- bzrlib/tests/test_bzrdir.py	2010-01-08 07:34:31 +0000
+++ bzrlib/tests/test_bzrdir.py	2010-02-11 09:31:16 +0000
@@ -50,9 +50,11 @@
     http_utils,
     )
 from bzrlib.tests.test_http import TestWithTransport_pycurl
-from bzrlib.transport import get_transport
+from bzrlib.transport import (
+    get_transport,
+    memory,
+    )
 from bzrlib.transport.http._urllib import HttpTransport_urllib
-from bzrlib.transport.memory import MemoryServer
 from bzrlib.transport.nosmart import NoSmartTransportDecorator
 from bzrlib.transport.readonly import ReadonlyTransportDecorator
 from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
@@ -354,7 +356,7 @@
 
     def test_create_branch_convenience_root(self):
         """Creating a branch at the root of a fs should work."""
-        self.vfs_transport_factory = MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
         # outside a repo the default convenience output is a repo+branch_tree
         format = bzrdir.format_registry.make_bzrdir('knit')
         branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
@@ -565,7 +567,7 @@
 
     def setUp(self):
         super(ChrootedTests, self).setUp()
-        if not self.vfs_transport_factory == MemoryServer:
+        if not self.vfs_transport_factory == memory.MemoryServer:
             self.transport_readonly_server = http_server.HttpServer
 
     def local_branch_path(self, branch):
@@ -1049,7 +1051,7 @@
 
     def setUp(self):
         super(NonLocalTests, self).setUp()
-        self.vfs_transport_factory = MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
 
     def test_create_branch_convenience(self):
         # outside a repo the default convenience output is a repo+branch_tree

=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2010-01-25 17:48:22 +0000
+++ bzrlib/tests/test_remote.py	2010-02-11 09:31:16 +0000
@@ -54,13 +54,14 @@
     )
 from bzrlib.repofmt import groupcompress_repo, pack_repo
 from bzrlib.revision import NULL_REVISION
-from bzrlib.smart import server, medium
+from bzrlib.smart import medium
 from bzrlib.smart.client import _SmartClient
 from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
 from bzrlib.tests import (
     condition_isinstance,
     split_suite_by_condition,
     multiply_tests,
+    test_server,
     )
 from bzrlib.transport import get_transport
 from bzrlib.transport.memory import MemoryTransport
@@ -75,9 +76,9 @@
         standard_tests, condition_isinstance(BasicRemoteObjectTests))
     smart_server_version_scenarios = [
         ('HPSS-v2',
-            {'transport_server': server.SmartTCPServer_for_testing_v2_only}),
+         {'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
         ('HPSS-v3',
-            {'transport_server': server.SmartTCPServer_for_testing})]
+         {'transport_server': test_server.SmartTCPServer_for_testing})]
     return multiply_tests(to_adapt, smart_server_version_scenarios, result)
 
 
@@ -2074,7 +2075,7 @@
 
     def test_allows_new_revisions(self):
         """get_parent_map's results can be updated by commit."""
-        smart_server = server.SmartTCPServer_for_testing()
+        smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(smart_server)
         self.make_branch('branch')
         branch = Branch.open(smart_server.get_url() + '/branch')
@@ -2622,7 +2623,7 @@
     """RemoteRepository.copy_content_into optimizations"""
 
     def test_copy_content_remote_to_local(self):
-        self.transport_server = server.SmartTCPServer_for_testing
+        self.transport_server = test_server.SmartTCPServer_for_testing
         src_repo = self.make_repository('repo1')
         src_repo = repository.Repository.open(self.get_url('repo1'))
         # At the moment the tarball-based copy_content_into can't write back
@@ -2941,7 +2942,7 @@
         stacked_branch = self.make_branch('stacked', format='1.9')
         stacked_branch.set_stacked_on_url('../base')
         # start a server looking at this
-        smart_server = server.SmartTCPServer_for_testing()
+        smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(smart_server)
         remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
         # can get its branch and repository
@@ -3103,7 +3104,7 @@
         super(TestRemoteBranchEffort, self).setUp()
         # Create a smart server that publishes whatever the backing VFS server
         # does.
-        self.smart_server = server.SmartTCPServer_for_testing()
+        self.smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(self.smart_server, self.get_server())
         # Log all HPSS calls into self.hpss_calls.
         _SmartClient.hooks.install_named_hook(

=== modified file 'bzrlib/tests/test_repository.py'
--- bzrlib/tests/test_repository.py	2010-01-31 12:10:40 +0000
+++ bzrlib/tests/test_repository.py	2010-02-11 09:31:16 +0000
@@ -51,7 +51,6 @@
     fakenfs,
     get_transport,
     )
-from bzrlib.transport.memory import MemoryServer
 from bzrlib import (
     bencode,
     bzrdir,

=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/test_selftest.py	2010-02-11 09:31:16 +0000
@@ -64,11 +64,12 @@
     features,
     stub_sftp,
     test_lsprof,
+    test_server,
     test_sftp_transport,
     TestUtil,
     )
 from bzrlib.trace import note
-from bzrlib.transport.memory import MemoryServer, MemoryTransport
+from bzrlib.transport import memory
 from bzrlib.version import _get_bzr_source_tree
 
 
@@ -622,9 +623,8 @@
 
     def test_get_readonly_url_none(self):
         from bzrlib.transport import get_transport
-        from bzrlib.transport.memory import MemoryServer
         from bzrlib.transport.readonly import ReadonlyTransportDecorator
-        self.vfs_transport_factory = MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
         self.transport_readonly_server = None
         # calling get_readonly_transport() constructs a decorator on the url
         # for the server
@@ -639,9 +639,8 @@
     def test_get_readonly_url_http(self):
         from bzrlib.tests.http_server import HttpServer
         from bzrlib.transport import get_transport
-        from bzrlib.transport.local import LocalURLServer
         from bzrlib.transport.http import HttpTransportBase
-        self.transport_server = LocalURLServer
+        self.transport_server = test_server.LocalURLServer
         self.transport_readonly_server = HttpServer
         # calling get_readonly_transport() gives us a HTTP server instance.
         url = self.get_readonly_url()
@@ -678,13 +677,13 @@
 
     def setUp(self):
         super(TestTestCaseTransports, self).setUp()
-        self.vfs_transport_factory = MemoryServer
+        self.vfs_transport_factory = memory.MemoryServer
 
     def test_make_bzrdir_preserves_transport(self):
         t = self.get_transport()
         result_bzrdir = self.make_bzrdir('subdir')
         self.assertIsInstance(result_bzrdir.transport,
-                              MemoryTransport)
+                              memory.MemoryTransport)
         # should not be on disk, should only be in memory
         self.failIfExists('subdir')
 
@@ -1470,7 +1469,7 @@
         # permitted.
         # Manually set one up (TestCase doesn't and shouldn't provide magic
         # machinery)
-        transport_server = MemoryServer()
+        transport_server = memory.MemoryServer()
         transport_server.start_server()
         self.addCleanup(transport_server.stop_server)
         t = transport.get_transport(transport_server.get_url())
@@ -1558,7 +1557,7 @@
             result.calls)
 
     def test_start_server_registers_url(self):
-        transport_server = MemoryServer()
+        transport_server = memory.MemoryServer()
         # A little strict, but unlikely to be changed soon.
         self.assertEqual([], self._bzr_selftest_roots)
         self.start_server(transport_server)
@@ -1805,8 +1804,7 @@
         # make_branch_and_tree has to use local branch and repositories
         # when the vfs transport and local disk are colocated, even if
         # a different transport is in use for url generation.
-        from bzrlib.transport.fakevfat import FakeVFATServer
-        self.transport_server = FakeVFATServer
+        self.transport_server = test_server.FakeVFATServer
         self.assertFalse(self.get_url('t1').startswith('file://'))
         tree = self.make_branch_and_tree('t1')
         base = tree.bzrdir.root_transport.base
@@ -1952,7 +1950,7 @@
         self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
 
     def test_transport_memory(self):
-        self.check_transport_set(bzrlib.transport.memory.MemoryServer)
+        self.check_transport_set(memory.MemoryServer)
 
 
 class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
@@ -2623,7 +2621,7 @@
         # Running bzr in blackbox mode, normal/expected/user errors should be
         # caught in the regular way and turned into an error message plus exit
         # code.
-        transport_server = MemoryServer()
+        transport_server = memory.MemoryServer()
         transport_server.start_server()
         self.addCleanup(transport_server.stop_server)
         url = transport_server.get_url()

=== added file 'bzrlib/tests/test_server.py'
--- bzrlib/tests/test_server.py	1970-01-01 00:00:00 +0000
+++ bzrlib/tests/test_server.py	2010-02-11 09:31:16 +0000
@@ -0,0 +1,312 @@
+# Copyright (C) 2005, 2006, 2007, 2008, 2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from bzrlib import (
+    transport,
+    urlutils,
+    )
+from bzrlib.transport import (
+    chroot,
+    pathfilter,
+    )
+from bzrlib.smart import server
+
+
+class TestServer(transport.Server):
+    """A Transport Server dedicated to tests.
+
+    The TestServer interface provides a server for a given transport. We use
+    these servers as loopback testing tools. For any given transport the
+    Servers it provides must either allow writing, or serve the contents
+    of os.getcwdu() at the time start_server is called.
+
+    Note that these are real servers - they must implement all the things
+    that we want bzr transports to take advantage of.
+    """
+
+    def get_url(self):
+        """Return a url for this server.
+
+        If the transport does not represent a disk directory (i.e. it is
+        a database like svn, or a memory only transport, it should return
+        a connection to a newly established resource for this Server.
+        Otherwise it should return a url that will provide access to the path
+        that was os.getcwdu() when start_server() was called.
+
+        Subsequent calls will return the same resource.
+        """
+        raise NotImplementedError
+
+    def get_bogus_url(self):
+        """Return a url for this protocol, that will fail to connect.
+
+        This may raise NotImplementedError to indicate that this server cannot
+        provide bogus urls.
+        """
+        raise NotImplementedError
+
+
+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
+    this just exists to tell the test code how to get to it.
+    """
+
+    def start_server(self):
+        pass
+
+    def get_url(self):
+        """See Transport.Server.get_url."""
+        return urlutils.local_path_to_url('')
+
+
+class DecoratorServer(TestServer):
+    """Server for the TransportDecorator for testing with.
+
+    To use this when subclassing TransportDecorator, override override the
+    get_decorator_class method.
+    """
+
+    def start_server(self, server=None):
+        """See bzrlib.transport.Server.start_server.
+
+        :server: decorate the urls given by server. If not provided a
+        LocalServer is created.
+        """
+        if server is not None:
+            self._made_server = False
+            self._server = server
+        else:
+            self._made_server = True
+            self._server = LocalURLServer()
+            self._server.start_server()
+
+    def stop_server(self):
+        if self._made_server:
+            self._server.stop_server()
+
+    def get_decorator_class(self):
+        """Return the class of the decorators we should be constructing."""
+        raise NotImplementedError(self.get_decorator_class)
+
+    def get_url_prefix(self):
+        """What URL prefix does this decorator produce?"""
+        return self.get_decorator_class()._get_url_prefix()
+
+    def get_bogus_url(self):
+        """See bzrlib.transport.Server.get_bogus_url."""
+        return self.get_url_prefix() + self._server.get_bogus_url()
+
+    def get_url(self):
+        """See bzrlib.transport.Server.get_url."""
+        return self.get_url_prefix() + self._server.get_url()
+
+
+class BrokenRenameServer(DecoratorServer):
+    """Server for the BrokenRenameTransportDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import brokenrename
+        return brokenrename.BrokenRenameTransportDecorator
+
+
+class FakeNFSServer(DecoratorServer):
+    """Server for the FakeNFSTransportDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import fakenfs
+        return fakenfs.FakeNFSTransportDecorator
+
+
+class FakeVFATServer(DecoratorServer):
+    """A server that suggests connections through FakeVFATTransportDecorator
+
+    For use in testing.
+    """
+
+    def get_decorator_class(self):
+        from bzrlib.transport import fakevfat
+        return fakevfat.FakeVFATTransportDecorator
+
+
+class LogDecoratorServer(DecoratorServer):
+    """Server for testing."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import log
+        return log.TransportLogDecorator
+
+
+class NoSmartTransportServer(DecoratorServer):
+    """Server for the NoSmartTransportDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import nosmart
+        return nosmart.NoSmartTransportDecorator
+
+
+class ReadonlyServer(DecoratorServer):
+    """Server for the ReadonlyTransportDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import readonly
+        return readonly.ReadonlyTransportDecorator
+
+
+class TraceServer(DecoratorServer):
+    """Server for the TransportTraceDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import trace
+        return trace.TransportTraceDecorator
+
+
+class UnlistableServer(DecoratorServer):
+    """Server for the UnlistableTransportDecorator for testing with."""
+
+    def get_decorator_class(self):
+        from bzrlib.transport import unlistable
+        return unlistable.UnlistableTransportDecorator
+
+
+class TestingPathFilteringServer(pathfilter.PathFilteringServer):
+
+    def __init__(self):
+        """TestingPathFilteringServer is not usable until start_server
+        is called."""
+
+    def start_server(self, backing_server=None):
+        """Setup the Chroot on backing_server."""
+        if backing_server is not None:
+            self.backing_transport = transport.get_transport(
+                backing_server.get_url())
+        else:
+            self.backing_transport = transport.get_transport('.')
+        self.backing_transport.clone('added-by-filter').ensure_base()
+        self.filter_func = lambda x: 'added-by-filter/' + x
+        super(TestingPathFilteringServer, self).start_server()
+
+    def get_bogus_url(self):
+        raise NotImplementedError
+
+
+class TestingChrootServer(chroot.ChrootServer):
+
+    def __init__(self):
+        """TestingChrootServer is not usable until start_server is called."""
+        super(TestingChrootServer, self).__init__(None)
+
+    def start_server(self, backing_server=None):
+        """Setup the Chroot on backing_server."""
+        if backing_server is not None:
+            self.backing_transport = transport.get_transport(
+                backing_server.get_url())
+        else:
+            self.backing_transport = transport.get_transport('.')
+        super(TestingChrootServer, self).start_server()
+
+    def get_bogus_url(self):
+        raise NotImplementedError
+
+
+class SmartTCPServer_for_testing(server.SmartTCPServer):
+    """Server suitable for use by transport tests.
+
+    This server is backed by the process's cwd.
+    """
+
+    def __init__(self, thread_name_suffix=''):
+        super(SmartTCPServer_for_testing, self).__init__(None)
+        self.client_path_extra = None
+        self.thread_name_suffix = thread_name_suffix
+
+    def get_backing_transport(self, backing_transport_server):
+        """Get a backing transport from a server we are decorating."""
+        return transport.get_transport(backing_transport_server.get_url())
+
+    def start_server(self, backing_transport_server=None,
+              client_path_extra='/extra/'):
+        """Set up server for testing.
+
+        :param backing_transport_server: backing server to use.  If not
+            specified, a LocalURLServer at the current working directory will
+            be used.
+        :param client_path_extra: a path segment starting with '/' to append to
+            the root URL for this server.  For instance, a value of '/foo/bar/'
+            will mean the root of the backing transport will be published at a
+            URL like `bzr://127.0.0.1:nnnn/foo/bar/`, rather than
+            `bzr://127.0.0.1:nnnn/`.  Default value is `extra`, so that tests
+            by default will fail unless they do the necessary path translation.
+        """
+        if not client_path_extra.startswith('/'):
+            raise ValueError(client_path_extra)
+        from bzrlib.transport.chroot import ChrootServer
+        if backing_transport_server is None:
+            backing_transport_server = LocalURLServer()
+        self.chroot_server = ChrootServer(
+            self.get_backing_transport(backing_transport_server))
+        self.chroot_server.start_server()
+        self.backing_transport = transport.get_transport(
+            self.chroot_server.get_url())
+        self.root_client_path = self.client_path_extra = client_path_extra
+        self.start_background_thread(self.thread_name_suffix)
+
+    def stop_server(self):
+        self.stop_background_thread()
+        self.chroot_server.stop_server()
+
+    def get_url(self):
+        url = super(SmartTCPServer_for_testing, self).get_url()
+        return url[:-1] + self.client_path_extra
+
+    def get_bogus_url(self):
+        """Return a URL which will fail to connect"""
+        return 'bzr://127.0.0.1:1/'
+
+
+class ReadonlySmartTCPServer_for_testing(SmartTCPServer_for_testing):
+    """Get a readonly server for testing."""
+
+    def get_backing_transport(self, backing_transport_server):
+        """Get a backing transport from a server we are decorating."""
+        url = 'readonly+' + backing_transport_server.get_url()
+        return transport.get_transport(url)
+
+
+class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
+    """A variation of SmartTCPServer_for_testing that limits the client to
+    using RPCs in protocol v2 (i.e. bzr <= 1.5).
+    """
+
+    def get_url(self):
+        url = super(SmartTCPServer_for_testing_v2_only, self).get_url()
+        url = 'bzr-v2://' + url[len('bzr://'):]
+        return url
+
+
+class ReadonlySmartTCPServer_for_testing_v2_only(
+    SmartTCPServer_for_testing_v2_only):
+    """Get a readonly server for testing."""
+
+    def get_backing_transport(self, backing_transport_server):
+        """Get a backing transport from a server we are decorating."""
+        url = 'readonly+' + backing_transport_server.get_url()
+        return transport.get_transport(url)
+
+
+
+

=== modified file 'bzrlib/tests/test_smart.py'
--- bzrlib/tests/test_smart.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/test_smart.py	2010-02-11 09:31:16 +0000
@@ -48,9 +48,9 @@
     server,
     vfs,
     )
+from bzrlib.tests import test_server
 from bzrlib.transport import (
     chroot,
-    local,
     memory,
     )
 
@@ -106,7 +106,7 @@
         self.transport_server = self.make_transport_server
 
     def make_transport_server(self):
-        return server.SmartTCPServer_for_testing('-' + self.id())
+        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
     def get_smart_medium(self):
         """Get a smart medium to use in tests."""
@@ -489,7 +489,7 @@
 class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
 
     def test_present_with_workingtree(self):
-        self.vfs_transport_factory = local.LocalURLServer
+        self.vfs_transport_factory = test_server.LocalURLServer
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
         bd = self.make_bzrdir('.')
@@ -520,7 +520,7 @@
 
     def test_branch_reference(self):
         """When there is a branch reference, the reference URL is returned."""
-        self.vfs_transport_factory = local.LocalURLServer
+        self.vfs_transport_factory = test_server.LocalURLServer
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranch(backing)
         branch = self.make_branch('branch')
@@ -561,7 +561,7 @@
 
     def test_branch_reference(self):
         """When there is a branch reference, the reference URL is returned."""
-        self.vfs_transport_factory = local.LocalURLServer
+        self.vfs_transport_factory = test_server.LocalURLServer
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranchV2(backing)
         branch = self.make_branch('branch')
@@ -624,7 +624,7 @@
 
     def test_branch_reference(self):
         """When there is a branch reference, the reference URL is returned."""
-        self.vfs_transport_factory = local.LocalURLServer
+        self.vfs_transport_factory = test_server.LocalURLServer
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranchV3(backing)
         branch = self.make_branch('branch')

=== modified file 'bzrlib/tests/test_transport.py'
--- bzrlib/tests/test_transport.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/test_transport.py	2010-02-11 09:31:16 +0000
@@ -36,7 +36,10 @@
     pathfilter,
     readonly,
     )
-from bzrlib.tests import features
+from bzrlib.tests import (
+    features,
+    test_server,
+    )
 
 
 # TODO: Should possibly split transport-specific tests into their own files.
@@ -593,7 +596,7 @@
 
     def test_fakenfs_server_default(self):
         # a FakeNFSServer() should bring up a local relpath server for itself
-        server = fakenfs.FakeNFSServer()
+        server = test_server.FakeNFSServer()
         self.start_server(server)
         # the url should be decorated appropriately
         self.assertStartsWith(server.get_url(), 'fakenfs+')

=== modified file 'bzrlib/transport/__init__.py'
--- bzrlib/transport/__init__.py	2010-01-07 03:03:01 +0000
+++ bzrlib/transport/__init__.py	2010-02-11 09:31:16 +0000
@@ -1663,13 +1663,7 @@
 class Server(object):
     """A Transport Server.
 
-    The Server interface provides a server for a given transport. We use
-    these servers as loopback testing tools. For any given transport the
-    Servers it provides must either allow writing, or serve the contents
-    of os.getcwdu() at the time start_server is called.
-
-    Note that these are real servers - they must implement all the things
-    that we want bzr transports to take advantage of.
+    The Server interface provides a server for a given transport type.
     """
 
     def start_server(self):
@@ -1678,27 +1672,6 @@
     def stop_server(self):
         """Remove the server and cleanup any resources it owns."""
 
-    def get_url(self):
-        """Return a url for this server.
-
-        If the transport does not represent a disk directory (i.e. it is
-        a database like svn, or a memory only transport, it should return
-        a connection to a newly established resource for this Server.
-        Otherwise it should return a url that will provide access to the path
-        that was os.getcwdu() when start_server() was called.
-
-        Subsequent calls will return the same resource.
-        """
-        raise NotImplementedError
-
-    def get_bogus_url(self):
-        """Return a url for this protocol, that will fail to connect.
-
-        This may raise NotImplementedError to indicate that this server cannot
-        provide bogus urls.
-        """
-        raise NotImplementedError
-
 
 # None is the default transport, for things with no url scheme
 register_transport_proto('file://',

=== modified file 'bzrlib/transport/brokenrename.py'
--- bzrlib/transport/brokenrename.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/brokenrename.py	2010-02-11 09:31:16 +0000
@@ -23,10 +23,10 @@
         errors,
         urlutils,
         )
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class BrokenRenameTransportDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class BrokenRenameTransportDecorator(decorator.TransportDecorator):
     """A transport that fails to detect clashing renames"""
 
     @classmethod
@@ -46,13 +46,6 @@
             return
 
 
-class BrokenRenameServer(DecoratorServer):
-    """Server for the BrokenRenameTransportDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return BrokenRenameTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
     # we don't use this for general testing, only for the tests that

=== modified file 'bzrlib/transport/chroot.py'
--- bzrlib/transport/chroot.py	2010-01-07 03:03:01 +0000
+++ bzrlib/transport/chroot.py	2010-02-11 09:31:16 +0000
@@ -65,21 +65,7 @@
         return self._relpath_from_server_root(relpath)
 
 
-class TestingChrootServer(ChrootServer):
-
-    def __init__(self):
-        """TestingChrootServer is not usable until start_server is called."""
-        ChrootServer.__init__(self, None)
-
-    def start_server(self, backing_server=None):
-        """Setup the Chroot on backing_server."""
-        if backing_server is not None:
-            self.backing_transport = get_transport(backing_server.get_url())
-        else:
-            self.backing_transport = get_transport('.')
-        ChrootServer.start_server(self)
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(ChrootTransport, TestingChrootServer)]
+    from bzrlib.tests import test_server
+    return [(ChrootTransport, test_server.TestingChrootServer)]

=== modified file 'bzrlib/transport/decorator.py'
--- bzrlib/transport/decorator.py	2010-01-07 03:03:01 +0000
+++ bzrlib/transport/decorator.py	2010-02-11 09:31:16 +0000
@@ -177,49 +177,6 @@
             return None
 
 
-class DecoratorServer(Server):
-    """Server for the TransportDecorator for testing with.
-
-    To use this when subclassing TransportDecorator, override override the
-    get_decorator_class method.
-    """
-
-    def start_server(self, server=None):
-        """See bzrlib.transport.Server.start_server.
-
-        :server: decorate the urls given by server. If not provided a
-        LocalServer is created.
-        """
-        if server is not None:
-            self._made_server = False
-            self._server = server
-        else:
-            from bzrlib.transport.local import LocalURLServer
-            self._made_server = True
-            self._server = LocalURLServer()
-            self._server.start_server()
-
-    def stop_server(self):
-        if self._made_server:
-            self._server.stop_server()
-
-    def get_decorator_class(self):
-        """Return the class of the decorators we should be constructing."""
-        raise NotImplementedError(self.get_decorator_class)
-
-    def get_url_prefix(self):
-        """What URL prefix does this decorator produce?"""
-        return self.get_decorator_class()._get_url_prefix()
-
-    def get_bogus_url(self):
-        """See bzrlib.transport.Server.get_bogus_url."""
-        return self.get_url_prefix() + self._server.get_bogus_url()
-
-    def get_url(self):
-        """See bzrlib.transport.Server.get_url."""
-        return self.get_url_prefix() + self._server.get_url()
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing.
 

=== modified file 'bzrlib/transport/fakenfs.py'
--- bzrlib/transport/fakenfs.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/fakenfs.py	2010-02-11 09:31:16 +0000
@@ -28,10 +28,10 @@
     errors,
     urlutils,
     )
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class FakeNFSTransportDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class FakeNFSTransportDecorator(decorator.TransportDecorator):
     """A transport that behaves like NFS, for testing"""
 
     @classmethod
@@ -62,14 +62,7 @@
         return self._decorated.delete(relpath)
 
 
-class FakeNFSServer(DecoratorServer):
-    """Server for the FakeNFSTransportDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return FakeNFSTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(FakeNFSTransportDecorator, FakeNFSServer),
-            ]
+    from bzrlib.tests import test_server
+    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer),]

=== modified file 'bzrlib/transport/fakevfat.py'
--- bzrlib/transport/fakevfat.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/fakevfat.py	2010-02-11 09:31:16 +0000
@@ -41,7 +41,7 @@
 import re
 
 from bzrlib.errors import TransportNotPossible
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
+from bzrlib.transport import decorator
 
 
 # TODO: It might be nice if these hooks were available in a more general way
@@ -52,7 +52,7 @@
 # which are not implemented here fail by default?
 
 
-class FakeVFATTransportDecorator(TransportDecorator):
+class FakeVFATTransportDecorator(decorator.TransportDecorator):
     """A decorator that can convert any transport to be readonly.
 
     This is requested via the 'vfat+' prefix to get_transport().
@@ -99,17 +99,7 @@
         return self._decorated.put_file(self._squash_name(relpath), f, mode)
 
 
-class FakeVFATServer(DecoratorServer):
-    """A server that suggests connections through FakeVFATTransportDecorator
-
-    For use in testing.
-    """
-
-    def get_decorator_class(self):
-        return FakeVFATTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(FakeVFATTransportDecorator, FakeVFATServer),
-            ]
+    from bzrlib.tests import test_server
+    return [(FakeVFATTransportDecorator, test_server.FakeVFATServer),]

=== modified file 'bzrlib/transport/local.py'
--- bzrlib/transport/local.py	2010-01-07 03:03:01 +0000
+++ bzrlib/transport/local.py	2010-02-11 09:31:16 +0000
@@ -39,14 +39,14 @@
 from bzrlib.transport import LateReadError
 """)
 
-from bzrlib.transport import Transport, Server
+from bzrlib import transport
 
 
 _append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY
 _put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY
 
 
-class LocalTransport(Transport):
+class LocalTransport(transport.Transport):
     """This is the transport agent for local filesystem access."""
 
     def __init__(self, base):
@@ -554,23 +554,7 @@
             return EmulatedWin32LocalTransport(abspath)
 
 
-class LocalURLServer(Server):
-    """A pretend server for local transports, using file:// urls.
-
-    Of course no actual server is required to access the local filesystem, so
-    this just exists to tell the test code how to get to it.
-    """
-
-    def start_server(self):
-        pass
-
-    def get_url(self):
-        """See Transport.Server.get_url."""
-        return urlutils.local_path_to_url('')
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [
-            (LocalTransport, LocalURLServer),
-            ]
+    from bzrlib.tests import test_server
+    return [(LocalTransport, test_server.LocalURLServer),]

=== modified file 'bzrlib/transport/log.py'
--- bzrlib/transport/log.py	2010-02-04 16:06:36 +0000
+++ bzrlib/transport/log.py	2010-02-11 09:31:16 +0000
@@ -26,18 +26,10 @@
 import types
 
 from bzrlib.trace import mutter
-from bzrlib.transport.decorator import (
-    TransportDecorator,
-    )
-from bzrlib.transport.trace import (
-    DecoratorServer,
-    TransportTraceDecorator,
-    )
-
-
-
-
-class TransportLogDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class TransportLogDecorator(decorator.TransportDecorator):
     """Decorator for Transports that logs interesting operations to .bzr.log.
 
     In general we want to log things that usually take a network round trip
@@ -156,13 +148,7 @@
         return t
 
 
-class LogDecoratorServer(DecoratorServer):
-    """Server for testing."""
-
-    def get_decorator_class(self):
-        return TransportLogDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(TransportLogDecorator, LogDecoratorServer)]
+    from bzrlib.tests import test_server
+    return [(TransportLogDecorator, test_server.LogDecoratorServer)]

=== modified file 'bzrlib/transport/memory.py'
--- bzrlib/transport/memory.py	2010-01-08 17:28:25 +0000
+++ bzrlib/transport/memory.py	2010-02-11 09:31:16 +0000
@@ -28,6 +28,7 @@
 import warnings
 
 from bzrlib import (
+    transport,
     urlutils,
     )
 from bzrlib.errors import (
@@ -42,10 +43,6 @@
     AppendBasedFileStream,
     _file_streams,
     LateReadError,
-    register_transport,
-    Server,
-    Transport,
-    unregister_transport,
     )
 
 
@@ -64,7 +61,7 @@
             self.st_mode = S_IFDIR | perms
 
 
-class MemoryTransport(Transport):
+class MemoryTransport(transport.Transport):
     """This is an in memory file system for transient data storage."""
 
     def __init__(self, url=""):
@@ -303,7 +300,7 @@
         self.transport = None
 
 
-class MemoryServer(Server):
+class MemoryServer(transport.Server):
     """Server for the MemoryTransport for testing with."""
 
     def start_server(self):
@@ -312,22 +309,26 @@
         self._locks = {}
         self._scheme = "memory+%s:///" % id(self)
         def memory_factory(url):
-            result = MemoryTransport(url)
+            from bzrlib.transport import memory
+            result = memory.MemoryTransport(url)
             result._dirs = self._dirs
             result._files = self._files
             result._locks = self._locks
             return result
         self._memory_factory = memory_factory
-        register_transport(self._scheme, self._memory_factory)
+        transport.register_transport(self._scheme, self._memory_factory)
 
     def stop_server(self):
         # unregister this server
-        unregister_transport(self._scheme, self._memory_factory)
+        transport.unregister_transport(self._scheme, self._memory_factory)
 
     def get_url(self):
         """See bzrlib.transport.Server.get_url."""
         return self._scheme
 
+    def get_bogus_url(self):
+        raise NotImplementedError
+
 
 def get_test_permutations():
     """Return the permutations to be used in testing."""

=== modified file 'bzrlib/transport/nosmart.py'
--- bzrlib/transport/nosmart.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/nosmart.py	2010-02-11 09:31:16 +0000
@@ -22,10 +22,10 @@
 """
 
 from bzrlib import errors
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class NoSmartTransportDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class NoSmartTransportDecorator(decorator.TransportDecorator):
     """A decorator for transports that disables get_smart_medium."""
 
     @classmethod
@@ -36,14 +36,8 @@
         raise errors.NoSmartMedium(self)
 
 
-class NoSmartTransportServer(DecoratorServer):
-    """Server for the NoSmartTransportDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return NoSmartTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(NoSmartTransportDecorator, NoSmartTransportServer)]
+    from bzrlib.tests import test_server
+    return [(NoSmartTransportDecorator, test_server.NoSmartTransportServer)]
 

=== modified file 'bzrlib/transport/pathfilter.py'
--- bzrlib/transport/pathfilter.py	2010-01-07 03:03:01 +0000
+++ bzrlib/transport/pathfilter.py	2010-02-11 09:31:16 +0000
@@ -174,22 +174,7 @@
         return self._call('stat', relpath)
 
 
-class TestingPathFilteringServer(PathFilteringServer):
-
-    def __init__(self):
-        """TestingChrootServer is not usable until start_server is called."""
-
-    def start_server(self, backing_server=None):
-        """Setup the Chroot on backing_server."""
-        if backing_server is not None:
-            self.backing_transport = get_transport(backing_server.get_url())
-        else:
-            self.backing_transport = get_transport('.')
-        self.backing_transport.clone('added-by-filter').ensure_base()
-        self.filter_func = lambda x: 'added-by-filter/' + x
-        PathFilteringServer.start_server(self)
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(PathFilteringTransport, TestingPathFilteringServer)]
+    from bzrlib.tests import test_server
+    return [(PathFilteringTransport, test_server.TestingPathFilteringServer)]

=== modified file 'bzrlib/transport/readonly.py'
--- bzrlib/transport/readonly.py	2009-03-24 01:53:42 +0000
+++ bzrlib/transport/readonly.py	2010-02-11 09:31:16 +0000
@@ -17,10 +17,10 @@
 """Implementation of Transport that adapts another transport to be readonly."""
 
 from bzrlib.errors import TransportNotPossible, NoSmartMedium
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class ReadonlyTransportDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class ReadonlyTransportDecorator(decorator.TransportDecorator):
     """A decorator that can convert any transport to be readonly.
 
     This is requested via the 'readonly+' prefix to get_transport().
@@ -78,15 +78,7 @@
         raise NoSmartMedium(self)
 
 
-
-class ReadonlyServer(DecoratorServer):
-    """Server for the ReadonlyTransportDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return ReadonlyTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(ReadonlyTransportDecorator, ReadonlyServer),
-            ]
+    from bzrlib.tests import test_server
+    return [(ReadonlyTransportDecorator, test_server.ReadonlyServer),]

=== modified file 'bzrlib/transport/remote.py'
--- bzrlib/transport/remote.py	2009-03-24 01:53:42 +0000
+++ bzrlib/transport/remote.py	2010-02-11 09:31:16 +0000
@@ -601,5 +601,5 @@
     """Return (transport, server) permutations for testing."""
     ### We may need a little more test framework support to construct an
     ### appropriate RemoteTransport in the future.
-    from bzrlib.smart import server
-    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]
+    from bzrlib.tests import test_server
+    return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]

=== modified file 'bzrlib/transport/trace.py'
--- bzrlib/transport/trace.py	2009-07-02 03:48:56 +0000
+++ bzrlib/transport/trace.py	2010-02-11 09:31:16 +0000
@@ -20,10 +20,10 @@
 and then delegates it.
 """
 
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class TransportTraceDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class TransportTraceDecorator(decorator.TransportDecorator):
     """A tracing decorator for Transports.
 
     Calls that potentially perform IO are logged to self._activity. The
@@ -43,7 +43,7 @@
 
         _decorated is a private parameter for cloning.
         """
-        TransportDecorator.__init__(self, url, _decorated)
+        super(TransportTraceDecorator, self).__init__(url, _decorated)
         if _from_transport is None:
             # newly created
             self._activity = []
@@ -169,13 +169,7 @@
         self._activity.append(operation_tuple)
 
 
-class TraceServer(DecoratorServer):
-    """Server for the TransportTraceDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return TransportTraceDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(TransportTraceDecorator, TraceServer)]
+    from bzrlib.tests import test_server
+    return [(TransportTraceDecorator, test_server.TraceServer)]

=== modified file 'bzrlib/transport/unlistable.py'
--- bzrlib/transport/unlistable.py	2009-03-23 14:59:43 +0000
+++ bzrlib/transport/unlistable.py	2010-02-11 09:31:16 +0000
@@ -18,10 +18,10 @@
 
 import bzrlib.errors as errors
 from bzrlib.transport import Transport
-from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
-
-
-class UnlistableTransportDecorator(TransportDecorator):
+from bzrlib.transport import decorator
+
+
+class UnlistableTransportDecorator(decorator.TransportDecorator):
     """A transport that disables file listing for testing."""
 
     @classmethod
@@ -39,14 +39,7 @@
         Transport.list_dir(self, relpath)
 
 
-class UnlistableServer(DecoratorServer):
-    """Server for the UnlistableTransportDecorator for testing with."""
-
-    def get_decorator_class(self):
-        return UnlistableTransportDecorator
-
-
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    return [(UnlistableTransportDecorator, UnlistableServer),
-            ]
+    from bzrlib.tests import test_server
+    return [(UnlistableTransportDecorator, test_server.UnlistableServer),]