At file:///home/vila/src/bzr/cleanup/test-servers/
------------------------------------------------------------
revno: 5057
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:29:20 +0100
message:
-s bb.test_branch passing
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py 2010-01-12 06:39:06 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py 2010-02-09 21:29:20 +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'])
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
