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

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Feb 9 21:11:11 GMT 2010


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

------------------------------------------------------------
revno: 5046
revision-id: v.ladeuil+lp at free.fr-20100209211111-ucohtnf3dy4m18r9
parent: v.ladeuil+lp at free.fr-20100209210552-x9xo02bw0g8lu0ck
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:11:11 +0100
message:
  -s bt.per_branch.test_push passing
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- a/bzrlib/tests/per_branch/test_push.py	2010-02-08 09:02:01 +0000
+++ b/bzrlib/tests/per_branch/test_push.py	2010-02-09 21:11:11 +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')



More information about the bazaar-commits mailing list