Rev 5041: selftest -s bt.test_selftest passing in file:///home/vila/src/bzr/cleanup/test-servers/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Feb 9 20:57:03 GMT 2010
At file:///home/vila/src/bzr/cleanup/test-servers/
------------------------------------------------------------
revno: 5041
revision-id: v.ladeuil+lp at free.fr-20100209205703-v3jkzqsdto6rnh4k
parent: v.ladeuil+lp at free.fr-20100209204950-p86omh9xnn0w124a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 21:57:03 +0100
message:
selftest -s bt.test_selftest passing
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/__init__.py'
--- a/bzrlib/tests/per_branch/__init__.py 2009-08-17 06:17:21 +0000
+++ b/bzrlib/tests/per_branch/__init__.py 2010-02-09 20:57:03 +0000
@@ -32,14 +32,8 @@
_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
def make_scenarios(transport_server, transport_readonly_server,
@@ -148,18 +142,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,
+ test_server.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,
+ test_server.MemoryServer,
name_suffix='-v2'))
return scenarios
=== modified file 'bzrlib/tests/per_bzrdir/__init__.py'
--- a/bzrlib/tests/per_bzrdir/__init__.py 2009-07-10 06:45:04 +0000
+++ b/bzrlib/tests/per_bzrdir/__init__.py 2010-02-09 20:57:03 +0000
@@ -26,11 +26,11 @@
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,
+ )
def make_scenarios(vfs_factory, transport_server, transport_readonly_server,
@@ -88,26 +88,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,
+ test_server.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,
+ test_server.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_repository/__init__.py'
--- a/bzrlib/tests/per_repository/__init__.py 2009-07-22 17:22:06 +0000
+++ b/bzrlib/tests/per_repository/__init__.py 2010-02-09 20:57:03 +0000
@@ -32,19 +32,13 @@
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
def formats_to_scenarios(formats, transport_server, transport_readonly_server,
@@ -91,14 +85,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,
+ test_server.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,
+ test_server.MemoryServer))
return format_scenarios
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2010-02-09 13:35:40 +0000
+++ b/bzrlib/tests/test_selftest.py 2010-02-09 20:57:03 +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 = test_server.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 = test_server.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 = test_server.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 = test_server.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(test_server.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 = test_server.MemoryServer()
transport_server.start_server()
self.addCleanup(transport_server.stop_server)
url = transport_server.get_url()
More information about the bazaar-commits
mailing list