Rev 5036: Move TestingPathFilteringServer to bzrlib.tests.test_server in file:///home/vila/src/bzr/cleanup/test-servers/

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Feb 9 20:33:43 GMT 2010


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

------------------------------------------------------------
revno: 5036
revision-id: v.ladeuil+lp at free.fr-20100209203343-ktxx7t0xvptvjnt1
parent: v.ladeuil+lp at free.fr-20100209202826-0u7aj2x51uzm79pv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 21:33:43 +0100
message:
  Move TestingPathFilteringServer to bzrlib.tests.test_server
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-02-09 20:28:26 +0000
+++ b/bzrlib/tests/test_server.py	2010-02-09 20:33:43 +0000
@@ -18,6 +18,9 @@
     transport,
     urlutils,
     )
+from bzrlib.transport import (
+    pathfilter,
+    )
 from bzrlib.smart import server
 
 
@@ -206,6 +209,23 @@
         return unlistable.UnlistableTransportDecorator
 
 
+class TestingPathFilteringServer(pathfilter.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 = 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()
+
+
 class SmartTCPServer_for_testing(server.SmartTCPServer):
     """Server suitable for use by transport tests.
 

=== modified file 'bzrlib/transport/pathfilter.py'
--- a/bzrlib/transport/pathfilter.py	2010-01-07 03:03:01 +0000
+++ b/bzrlib/transport/pathfilter.py	2010-02-09 20:33:43 +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/trace.py'
--- a/bzrlib/transport/trace.py	2010-02-09 17:24:11 +0000
+++ b/bzrlib/transport/trace.py	2010-02-09 20:33:43 +0000
@@ -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 = []



More information about the bazaar-commits mailing list