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

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5047
revision-id: v.ladeuil+lp at free.fr-20100209211324-4phvpk3owca5dgoe
parent: v.ladeuil+lp at free.fr-20100209211111-ucohtnf3dy4m18r9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:13:24 +0100
message:
  -s bt.per_branch.test_http passing
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_http.py'
--- a/bzrlib/tests/per_branch/test_http.py	2010-02-08 08:46:32 +0000
+++ b/bzrlib/tests/per_branch/test_http.py	2010-02-09 21:13:24 +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."""