Rev 4943: (mbp) rename Server.setUp and tearDown to start_server and stop_server in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jan 8 03:35:13 GMT 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4943 [merge]
revision-id: pqm at pqm.ubuntu.com-20100108033509-5dp440ermqsavlhr
parent: pqm at pqm.ubuntu.com-20100108022215-apa9diojzv5p03zf
parent: mbp at sourcefrog.net-20100108024349-u7c91vv4b0b842iw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-01-08 03:35:09 +0000
message:
(mbp) rename Server.setUp and tearDown to start_server and stop_server
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/ftp_server/__init__.py __init__.py-20090227130107-4gcpgvr00l7v3fsw-1
bzrlib/tests/ftp_server/medusa_based.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/ftp_server/pyftpdlib_based.py pyftpdlib_based.py-20090227151014-882k9q34m1gwnhvi-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/pathfilter.py pathfilter.py-20090911074646-d3befzxpj1zglo7s-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
=== modified file 'NEWS'
--- a/NEWS 2010-01-07 17:46:25 +0000
+++ b/NEWS 2010-01-08 03:35:09 +0000
@@ -109,6 +109,11 @@
CamelCase. For the features that were more likely to be used, we added a
deprecation thunk, but not all. (John Arbash Meinel)
+* The Transport ``Server.tearDown`` method is now renamed to
+ ``stop_server`` and ``setUp`` to ``start_server`` for consistency with
+ our normal naming pattern, and to avoid confusion with Python's
+ ``TestCase.tearDown``. (Martin Pool)
+
* ``WorkingTree.update`` implementations must now accept a ``revision``
parameter.
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-12-02 17:56:06 +0000
+++ b/bzrlib/bzrdir.py 2010-01-06 04:53:40 +0000
@@ -3110,6 +3110,10 @@
BzrDirMetaFormat1.__init__(self)
self._network_name = None
+ def __repr__(self):
+ return "%s(_network_name=%r)" % (self.__class__.__name__,
+ self._network_name)
+
def get_format_description(self):
if self._network_name:
real_format = network_format_registry.get(self._network_name)
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- a/bzrlib/plugins/launchpad/test_lp_directory.py 2009-10-30 21:02:37 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_directory.py 2010-01-07 03:03:01 +0000
@@ -274,12 +274,12 @@
def setUp(self):
tests.TestCase.setUp(self)
self.server = self.server_class()
- self.server.setUp()
+ self.server.start_server()
# Ensure we don't clobber env
self._captureVar('BZR_LP_XMLRPC_URL', None)
def tearDown(self):
- self.server.tearDown()
+ self.server.stop_server()
tests.TestCase.tearDown(self)
def set_canned_response(self, server, path):
=== modified file 'bzrlib/smart/server.py'
--- a/bzrlib/smart/server.py 2009-09-23 06:54:14 +0000
+++ b/bzrlib/smart/server.py 2010-01-07 03:03:01 +0000
@@ -251,7 +251,7 @@
"""Get a backing transport from a server we are decorating."""
return transport.get_transport(backing_transport_server.get_url())
- def setUp(self, backing_transport_server=None,
+ def start_server(self, backing_transport_server=None,
client_path_extra='/extra/'):
"""Set up server for testing.
@@ -273,15 +273,15 @@
backing_transport_server = LocalURLServer()
self.chroot_server = ChrootServer(
self.get_backing_transport(backing_transport_server))
- self.chroot_server.setUp()
+ self.chroot_server.start_server()
self.backing_transport = transport.get_transport(
self.chroot_server.get_url())
self.root_client_path = self.client_path_extra = client_path_extra
self.start_background_thread(self.thread_name_suffix)
- def tearDown(self):
+ def stop_server(self):
self.stop_background_thread()
- self.chroot_server.tearDown()
+ self.chroot_server.stop_server()
def get_url(self):
url = super(SmartTCPServer_for_testing, self).get_url()
@@ -386,15 +386,15 @@
"""Chroot transport, and decorate with userdir expander."""
self.base_path = self.get_base_path(transport)
chroot_server = chroot.ChrootServer(transport)
- chroot_server.setUp()
- self.cleanups.append(chroot_server.tearDown)
+ chroot_server.start_server()
+ self.cleanups.append(chroot_server.stop_server)
transport = get_transport(chroot_server.get_url())
if self.base_path is not None:
# Decorate the server's backing transport with a filter that can
# expand homedirs.
expand_userdirs = self._make_expand_userdirs_filter(transport)
- expand_userdirs.setUp()
- self.cleanups.append(expand_userdirs.tearDown)
+ expand_userdirs.start_server()
+ self.cleanups.append(expand_userdirs.stop_server)
transport = get_transport(expand_userdirs.get_url())
self.transport = transport
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-12-23 06:35:48 +0000
+++ b/bzrlib/tests/__init__.py 2010-01-07 03:03:01 +0000
@@ -1017,10 +1017,10 @@
server's urls to be used.
"""
if backing_server is None:
- transport_server.setUp()
+ transport_server.start_server()
else:
- transport_server.setUp(backing_server)
- self.addCleanup(transport_server.tearDown)
+ transport_server.start_server(backing_server)
+ self.addCleanup(transport_server.stop_server)
# Obtain a real transport because if the server supplies a password, it
# will be hidden from the base on the client side.
t = get_transport(transport_server.get_url())
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2009-12-25 13:47:23 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2010-01-07 03:03:01 +0000
@@ -584,7 +584,7 @@
class RedirectingMemoryServer(memory.MemoryServer):
- def setUp(self):
+ def start_server(self):
self._dirs = {'/': None}
self._files = {}
self._locks = {}
@@ -598,7 +598,7 @@
result._locks = self._locks
return result
- def tearDown(self):
+ def stop_server(self):
transport.unregister_transport(self._scheme, self._memory_factory)
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2009-12-22 18:18:20 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2010-01-07 03:03:01 +0000
@@ -287,7 +287,7 @@
return path
def make_test_server(self, base_path='/'):
- """Make and setUp a BzrServerFactory, backed by a memory transport, and
+ """Make and start a BzrServerFactory, backed by a memory transport, and
creat '/home/user' in that transport.
"""
bzr_server = BzrServerFactory(
=== modified file 'bzrlib/tests/ftp_server/__init__.py'
--- a/bzrlib/tests/ftp_server/__init__.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/ftp_server/__init__.py 2010-01-07 03:03:01 +0000
@@ -66,10 +66,10 @@
never called).
"""
- def setUp(self, vfs_server=None):
+ def start_server(self, vfs_server=None):
pass
- def tearDown(self):
+ def stop_server(self):
pass
def get_url(self):
=== modified file 'bzrlib/tests/ftp_server/medusa_based.py'
--- a/bzrlib/tests/ftp_server/medusa_based.py 2010-01-07 16:27:12 +0000
+++ b/bzrlib/tests/ftp_server/medusa_based.py 2010-01-08 03:35:09 +0000
@@ -235,7 +235,7 @@
"""This is used by medusa.ftp_server to log connections, etc."""
self.logs.append(message)
- def setUp(self, vfs_server=None):
+ def start_server(self, vfs_server=None):
from bzrlib.transport.local import LocalURLServer
if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
raise AssertionError(
@@ -257,8 +257,7 @@
self._async_thread.setDaemon(True)
self._async_thread.start()
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
+ def stop_server(self):
self._ftp_server.close()
asyncore.close_all()
self._async_thread.join()
=== modified file 'bzrlib/tests/ftp_server/pyftpdlib_based.py'
--- a/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-01-07 14:05:12 +0000
+++ b/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-01-08 03:35:09 +0000
@@ -157,7 +157,7 @@
"""This is used by ftp_server to log connections, etc."""
self.logs.append(message)
- def setUp(self, vfs_server=None):
+ def start_server(self, vfs_server=None):
from bzrlib.transport.local import LocalURLServer
if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
raise AssertionError(
@@ -187,8 +187,8 @@
self._ftpd_starting.acquire()
self._ftpd_starting.release()
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
+ def stop_server(self):
+ """See bzrlib.transport.Server.stop_server."""
# Tell the server to stop, but also close the server socket for tests
# that start the server but never initiate a connection. Closing the
# socket should be done first though, to avoid further connections.
@@ -197,7 +197,7 @@
self._ftpd_thread.join()
def _run_server(self):
- """Run the server until tearDown is called, shut it down properly then.
+ """Run the server until stop_server is called, shut it down properly then.
"""
self._ftpd_running = True
self._ftpd_starting.release()
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py 2009-11-18 17:36:36 +0000
+++ b/bzrlib/tests/http_server.py 2010-01-07 03:03:01 +0000
@@ -318,7 +318,7 @@
self.test_case_server = test_case_server
self._home_dir = test_case_server._home_dir
- def tearDown(self):
+ def stop_server(self):
"""Called to clean-up the server.
Since the server may be (surely is, even) in a blocking listen, we
@@ -347,7 +347,7 @@
# 'Socket is not connected' can also occur on OSX, with a
# "regular" ENOTCONN (when something went wrong during test case
# setup leading to self.setUp() *not* being called but
- # self.tearDown() still being called -- vila20081106
+ # self.stop_server() still being called -- vila20081106
if not len(e.args) or e.args[0] not in (errno.ENOTCONN, 10057):
raise
# Let the server properly close the socket
@@ -521,8 +521,8 @@
"""Capture Server log output."""
self.logs.append(format % args)
- def setUp(self, backing_transport_server=None):
- """See bzrlib.transport.Server.setUp.
+ def start_server(self, backing_transport_server=None):
+ """See bzrlib.transport.Server.start_server.
:param backing_transport_server: The transport that requests over this
protocol should be forwarded to. Note that this is currently not
@@ -557,9 +557,8 @@
self._http_starting.release()
self.logs = []
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
- self._httpd.tearDown()
+ def stop_server(self):
+ self._httpd.stop_server()
self._http_running = False
# We don't need to 'self._http_thread.join()' here since the thread is
# a daemonic one and will be garbage collected anyway. Joining just
=== modified file 'bzrlib/tests/http_utils.py'
--- a/bzrlib/tests/http_utils.py 2009-08-27 22:17:35 +0000
+++ b/bzrlib/tests/http_utils.py 2010-01-07 03:03:01 +0000
@@ -58,12 +58,12 @@
"""Hand the request off to a smart server instance."""
backing = get_transport(self.server.test_case_server._home_dir)
chroot_server = chroot.ChrootServer(backing)
- chroot_server.setUp()
+ chroot_server.start_server()
try:
t = get_transport(chroot_server.get_url())
self.do_POST_inner(t)
finally:
- chroot_server.tearDown()
+ chroot_server.stop_server()
def do_POST_inner(self, chrooted_transport):
self.send_response(200)
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2009-08-27 22:17:35 +0000
+++ b/bzrlib/tests/test_bundle.py 2010-01-08 02:43:49 +0000
@@ -1850,7 +1850,7 @@
class _DisconnectingTCPServer(object):
"""A TCP server that immediately closes any connection made to it."""
- def setUp(self):
+ def start_server(self):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.bind(('127.0.0.1', 0))
self.sock.listen(1)
@@ -1868,7 +1868,7 @@
def get_url(self):
return 'bzr://127.0.0.1:%d/' % (self.port,)
- def tearDown(self):
+ def stop_server(self):
try:
# make sure the thread dies by connecting to the listening socket,
# just in case the test failed to do so.
@@ -1879,4 +1879,3 @@
pass
self.sock.close()
self.thread.join()
-
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2009-12-30 12:09:47 +0000
+++ b/bzrlib/tests/test_http.py 2010-01-07 03:03:01 +0000
@@ -218,7 +218,7 @@
def get_url(self):
return '%s://%s:%s/' % (self.scheme, self.host, self.port)
- def setUp(self):
+ def start_server(self):
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._sock.bind(('127.0.0.1', 0))
self.host, self.port = self._sock.getsockname()
@@ -247,7 +247,7 @@
# The client may have already closed the socket.
pass
- def tearDown(self):
+ def stop_server(self):
try:
self._sock.close()
except socket.error:
@@ -306,26 +306,26 @@
server = http_server.HttpServer(BogusRequestHandler)
try:
- self.assertRaises(httplib.UnknownProtocol, server.setUp)
+ self.assertRaises(httplib.UnknownProtocol, server.start_server)
except:
- server.tearDown()
+ server.stop_server()
self.fail('HTTP Server creation did not raise UnknownProtocol')
def test_force_invalid_protocol(self):
server = http_server.HttpServer(protocol_version='HTTP/0.1')
try:
- self.assertRaises(httplib.UnknownProtocol, server.setUp)
+ self.assertRaises(httplib.UnknownProtocol, server.start_server)
except:
- server.tearDown()
+ server.stop_server()
self.fail('HTTP Server creation did not raise UnknownProtocol')
def test_server_start_and_stop(self):
server = http_server.HttpServer()
- server.setUp()
+ server.start_server()
try:
self.assertTrue(server._http_running)
finally:
- server.tearDown()
+ server.stop_server()
self.assertFalse(server._http_running)
def test_create_http_server_one_zero(self):
@@ -428,12 +428,12 @@
def test_http_impl_urls(self):
"""There are servers which ask for particular clients to connect"""
server = self._server()
- server.setUp()
+ server.start_server()
try:
url = server.get_url()
self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
finally:
- server.tearDown()
+ server.stop_server()
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
@@ -763,14 +763,14 @@
self.assertEqual(None, server.host)
self.assertEqual(None, server.port)
- def test_setUp_and_tearDown(self):
+ def test_setUp_and_stop(self):
server = RecordingServer(expect_body_tail=None)
- server.setUp()
+ server.start_server()
try:
self.assertNotEqual(None, server.host)
self.assertNotEqual(None, server.port)
finally:
- server.tearDown()
+ server.stop_server()
self.assertEqual(None, server.host)
self.assertEqual(None, server.port)
@@ -1964,7 +1964,7 @@
def setUp(self):
tests.TestCase.setUp(self)
self.server = self._activity_server(self._protocol_version)
- self.server.setUp()
+ self.server.start_server()
self.activities = {}
def report_activity(t, bytes, direction):
count = self.activities.get(direction, 0)
@@ -1979,7 +1979,7 @@
def tearDown(self):
self._transport._report_activity = self.orig_report_activity
- self.server.tearDown()
+ self.server.stop_server()
tests.TestCase.tearDown(self)
def get_transport(self):
@@ -2105,7 +2105,7 @@
def setUp(self):
tests.TestCase.setUp(self)
self.server = self._activity_server(self._protocol_version)
- self.server.setUp()
+ self.server.start_server()
self.activities = {}
def report_activity(t, bytes, direction):
count = self.activities.get(direction, 0)
@@ -2120,7 +2120,7 @@
def tearDown(self):
self._transport._report_activity = self.orig_report_activity
- self.server.tearDown()
+ self.server.stop_server()
tests.TestCase.tearDown(self)
@@ -2136,7 +2136,7 @@
self.server = ActivityHTTPServer('HTTP/1.1')
self._transport=_urllib.HttpTransport_urllib
- self.server.setUp()
+ self.server.start_server()
# We override at class level because constructors may propagate the
# bound method and render instance overriding ineffective (an
@@ -2146,7 +2146,7 @@
def tearDown(self):
self._transport._report_activity = self.orig_report_activity
- self.server.tearDown()
+ self.server.stop_server()
tests.TestCase.tearDown(self)
def assertActivitiesMatch(self):
=== modified file 'bzrlib/tests/test_lockable_files.py'
--- a/bzrlib/tests/test_lockable_files.py 2009-07-27 05:38:00 +0000
+++ b/bzrlib/tests/test_lockable_files.py 2010-01-06 04:48:59 +0000
@@ -285,8 +285,8 @@
self.lockable = self.get_lockable()
self.lockable.create_lock()
- def tearDown(self):
- super(TestLockableFiles_TransportLock, self).tearDown()
+ def stop_server(self):
+ super(TestLockableFiles_TransportLock, self).stop_server()
# free the subtransport so that we do not get a 5 second
# timeout due to the SFTP connection cache.
try:
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2010-01-06 18:50:08 +0000
+++ b/bzrlib/tests/test_selftest.py 2010-01-08 03:35:09 +0000
@@ -1485,8 +1485,8 @@
# Manually set one up (TestCase doesn't and shouldn't provide magic
# machinery)
transport_server = MemoryServer()
- transport_server.setUp()
- self.addCleanup(transport_server.tearDown)
+ transport_server.start_server()
+ self.addCleanup(transport_server.stop_server)
t = transport.get_transport(transport_server.get_url())
bzrdir.BzrDir.create(t.base)
self.assertRaises(errors.BzrError,
@@ -2600,8 +2600,8 @@
# caught in the regular way and turned into an error message plus exit
# code.
transport_server = MemoryServer()
- transport_server.setUp()
- self.addCleanup(transport_server.tearDown)
+ transport_server.start_server()
+ self.addCleanup(transport_server.stop_server)
url = transport_server.get_url()
self.permit_url(url)
out, err = self.run_bzr(["log", "%s/nonexistantpath" % url], retcode=3)
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2009-12-21 19:52:56 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2010-01-07 03:03:01 +0000
@@ -192,14 +192,14 @@
def test_abspath_root_sibling_server(self):
from bzrlib.transport.sftp import SFTPSiblingAbsoluteServer
server = SFTPSiblingAbsoluteServer()
- server.setUp()
+ server.start_server()
try:
transport = get_transport(server.get_url())
self.assertFalse(transport.abspath('/').endswith('/~/'))
self.assertTrue(transport.abspath('/').endswith('/'))
del transport
finally:
- server.tearDown()
+ server.stop_server()
class SFTPBranchTest(TestCaseWithSFTPServer):
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py 2009-12-16 17:29:53 +0000
+++ b/bzrlib/tests/test_smart_transport.py 2010-01-07 03:03:01 +0000
@@ -987,10 +987,10 @@
All of these tests are run with a server running on another thread serving
a MemoryTransport, and a connection to it already open.
- the server is obtained by calling self.setUpServer(readonly=False).
+ the server is obtained by calling self.start_server(readonly=False).
"""
- def setUpServer(self, readonly=False, backing_transport=None):
+ def start_server(self, readonly=False, backing_transport=None):
"""Setup the server.
:param readonly: Create a readonly server.
@@ -1000,8 +1000,8 @@
# self.vfs_transport_factory etc.
if not backing_transport:
mem_server = memory.MemoryServer()
- mem_server.setUp()
- self.addCleanup(mem_server.tearDown)
+ mem_server.start_server()
+ self.addCleanup(mem_server.stop_server)
self.permit_url(mem_server.get_url())
self.backing_transport = get_transport(mem_server.get_url())
else:
@@ -1021,6 +1021,7 @@
del self.transport
if getattr(self, 'server', None):
self.server.stop_background_thread()
+ # XXX: why not .stop_server() -- mbp 20100106
del self.server
@@ -1028,7 +1029,7 @@
def test_server_setup_teardown(self):
"""It should be safe to teardown the server with no requests."""
- self.setUpServer()
+ self.start_server()
server = self.server
transport = remote.RemoteTCPTransport(self.server.get_url())
self.tearDownServer()
@@ -1036,7 +1037,7 @@
def test_server_closes_listening_sock_on_shutdown_after_request(self):
"""The server should close its listening socket when it's stopped."""
- self.setUpServer()
+ self.start_server()
server = self.server
self.transport.has('.')
self.tearDownServer()
@@ -1051,7 +1052,7 @@
def setUp(self):
super(WritableEndToEndTests, self).setUp()
- self.setUpServer()
+ self.start_server()
def test_start_tcp_server(self):
url = self.server.get_url()
@@ -1130,7 +1131,7 @@
def test_mkdir_error_readonly(self):
"""TransportNotPossible should be preserved from the backing transport."""
self._captureVar('BZR_NO_SMART_VFS', None)
- self.setUpServer(readonly=True)
+ self.start_server(readonly=True)
self.assertRaises(errors.TransportNotPossible, self.transport.mkdir,
'foo')
@@ -1146,7 +1147,7 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_started',
self.capture_server_call, None)
- self.setUpServer()
+ self.start_server()
# at this point, the server will be starting a thread up.
# there is no indicator at the moment, so bodge it by doing a request.
self.transport.has('.')
@@ -1160,7 +1161,7 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_started',
self.capture_server_call, None)
- self.setUpServer(backing_transport=get_transport("."))
+ self.start_server(backing_transport=get_transport("."))
# at this point, the server will be starting a thread up.
# there is no indicator at the moment, so bodge it by doing a request.
self.transport.has('.')
@@ -1176,7 +1177,7 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_stopped',
self.capture_server_call, None)
- self.setUpServer()
+ self.start_server()
result = [([self.backing_transport.base], self.transport.base)]
# check the stopping message isn't emitted up front.
self.assertEqual([], self.hook_calls)
@@ -1193,7 +1194,7 @@
self.hook_calls = []
server.SmartTCPServer.hooks.install_named_hook('server_stopped',
self.capture_server_call, None)
- self.setUpServer(backing_transport=get_transport("."))
+ self.start_server(backing_transport=get_transport("."))
result = [(
[self.backing_transport.base, self.backing_transport.external_url()]
, self.transport.base)]
=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py 2009-12-21 19:52:56 +0000
+++ b/bzrlib/tests/test_transport.py 2010-01-07 03:03:01 +0000
@@ -430,27 +430,27 @@
def test_setUp(self):
backing_transport = MemoryTransport()
server = ChrootServer(backing_transport)
- server.setUp()
+ server.start_server()
try:
self.assertTrue(server.scheme in _get_protocol_handlers().keys())
finally:
- server.tearDown()
+ server.stop_server()
- def test_tearDown(self):
+ def test_stop_server(self):
backing_transport = MemoryTransport()
server = ChrootServer(backing_transport)
- server.setUp()
- server.tearDown()
+ server.start_server()
+ server.stop_server()
self.assertFalse(server.scheme in _get_protocol_handlers().keys())
def test_get_url(self):
backing_transport = MemoryTransport()
server = ChrootServer(backing_transport)
- server.setUp()
+ server.start_server()
try:
self.assertEqual('chroot-%d:///' % id(server), server.get_url())
finally:
- server.tearDown()
+ server.stop_server()
class PathFilteringDecoratorTransportTest(TestCase):
@@ -460,13 +460,13 @@
# The abspath is always relative to the base of the backing transport.
server = PathFilteringServer(get_transport('memory:///foo/bar/'),
lambda x: x)
- server.setUp()
+ server.start_server()
transport = get_transport(server.get_url())
self.assertEqual(server.get_url(), transport.abspath('/'))
subdir_transport = transport.clone('subdir')
self.assertEqual(server.get_url(), subdir_transport.abspath('/'))
- server.tearDown()
+ server.stop_server()
def make_pf_transport(self, filter_func=None):
"""Make a PathFilteringTransport backed by a MemoryTransport.
@@ -477,8 +477,8 @@
filter_func = lambda x: x
server = PathFilteringServer(
get_transport('memory:///foo/bar/'), filter_func)
- server.setUp()
- self.addCleanup(server.tearDown)
+ server.start_server()
+ self.addCleanup(server.stop_server)
return get_transport(server.get_url())
def test__filter(self):
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2009-10-22 13:55:55 +0000
+++ b/bzrlib/transport/__init__.py 2010-01-07 03:03:01 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -1666,16 +1666,16 @@
The Server interface provides a server for a given transport. We use
these servers as loopback testing tools. For any given transport the
Servers it provides must either allow writing, or serve the contents
- of os.getcwdu() at the time setUp is called.
+ of os.getcwdu() at the time start_server is called.
Note that these are real servers - they must implement all the things
that we want bzr transports to take advantage of.
"""
- def setUp(self):
+ def start_server(self):
"""Setup the server to service requests."""
- def tearDown(self):
+ def stop_server(self):
"""Remove the server and cleanup any resources it owns."""
def get_url(self):
@@ -1685,7 +1685,7 @@
a database like svn, or a memory only transport, it should return
a connection to a newly established resource for this Server.
Otherwise it should return a url that will provide access to the path
- that was os.getcwdu() when setUp() was called.
+ that was os.getcwdu() when start_server() was called.
Subsequent calls will return the same resource.
"""
=== modified file 'bzrlib/transport/chroot.py'
--- a/bzrlib/transport/chroot.py 2009-09-16 04:37:33 +0000
+++ b/bzrlib/transport/chroot.py 2010-01-07 03:03:01 +0000
@@ -48,7 +48,7 @@
def _factory(self, url):
return ChrootTransport(self, url)
- def setUp(self):
+ def start_server(self):
self.scheme = 'chroot-%d:///' % id(self)
register_transport(self.scheme, self._factory)
@@ -68,16 +68,16 @@
class TestingChrootServer(ChrootServer):
def __init__(self):
- """TestingChrootServer is not usable until setUp is called."""
+ """TestingChrootServer is not usable until start_server is called."""
ChrootServer.__init__(self, None)
- def setUp(self, backing_server=None):
+ 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('.')
- ChrootServer.setUp(self)
+ ChrootServer.start_server(self)
def get_test_permutations():
=== modified file 'bzrlib/transport/decorator.py'
--- a/bzrlib/transport/decorator.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/transport/decorator.py 2010-01-07 03:03:01 +0000
@@ -184,8 +184,8 @@
get_decorator_class method.
"""
- def setUp(self, server=None):
- """See bzrlib.transport.Server.setUp.
+ def start_server(self, server=None):
+ """See bzrlib.transport.Server.start_server.
:server: decorate the urls given by server. If not provided a
LocalServer is created.
@@ -197,12 +197,11 @@
from bzrlib.transport.local import LocalURLServer
self._made_server = True
self._server = LocalURLServer()
- self._server.setUp()
+ self._server.start_server()
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
+ def stop_server(self):
if self._made_server:
- self._server.tearDown()
+ self._server.stop_server()
def get_decorator_class(self):
"""Return the class of the decorators we should be constructing."""
=== modified file 'bzrlib/transport/http/wsgi.py'
--- a/bzrlib/transport/http/wsgi.py 2009-10-21 06:05:49 +0000
+++ b/bzrlib/transport/http/wsgi.py 2010-01-07 03:03:01 +0000
@@ -106,7 +106,7 @@
# e.g. consider a smart server request for "get /etc/passwd" or
# something.
self.chroot_server = chroot.ChrootServer(backing_transport)
- self.chroot_server.setUp()
+ self.chroot_server.start_server()
self.backing_transport = get_transport(self.chroot_server.get_url())
self.root_client_path = root_client_path
# While the chroot server can technically be torn down at this point,
@@ -114,7 +114,7 @@
# protocol dictionary, we don't *just in case* there are parts of
# bzrlib that will invoke 'get_transport' on urls rather than cloning
# around the existing transport.
- #self.chroot_server.tearDown()
+ #self.chroot_server.stop_server()
def __call__(self, environ, start_response):
"""WSGI application callable."""
=== modified file 'bzrlib/transport/local.py'
--- a/bzrlib/transport/local.py 2009-06-23 01:59:20 +0000
+++ b/bzrlib/transport/local.py 2010-01-07 03:03:01 +0000
@@ -561,11 +561,8 @@
this just exists to tell the test code how to get to it.
"""
- def setUp(self):
- """Setup the server to service requests.
-
- :param decorated_transport: ignored by this implementation.
- """
+ def start_server(self):
+ pass
def get_url(self):
"""See Transport.Server.get_url."""
=== modified file 'bzrlib/transport/memory.py'
--- a/bzrlib/transport/memory.py 2009-07-20 04:26:55 +0000
+++ b/bzrlib/transport/memory.py 2010-01-07 03:03:01 +0000
@@ -303,8 +303,7 @@
class MemoryServer(Server):
"""Server for the MemoryTransport for testing with."""
- def setUp(self):
- """See bzrlib.transport.Server.setUp."""
+ def start_server(self):
self._dirs = {'/':None}
self._files = {}
self._locks = {}
@@ -317,9 +316,10 @@
return result
register_transport(self._scheme, memory_factory)
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
+ def stop_server(self):
# unregister this server
+ # XXX: why isn't this done? -- mbp 20100106
+ pass
def get_url(self):
"""See bzrlib.transport.Server.get_url."""
=== modified file 'bzrlib/transport/pathfilter.py'
--- a/bzrlib/transport/pathfilter.py 2009-09-16 05:00:54 +0000
+++ b/bzrlib/transport/pathfilter.py 2010-01-07 03:03:01 +0000
@@ -59,11 +59,11 @@
def get_url(self):
return self.scheme
- def setUp(self):
+ def start_server(self):
self.scheme = 'filtered-%d:///' % id(self)
register_transport(self.scheme, self._factory)
- def tearDown(self):
+ def stop_server(self):
unregister_transport(self.scheme, self._factory)
@@ -177,9 +177,9 @@
class TestingPathFilteringServer(PathFilteringServer):
def __init__(self):
- """TestingChrootServer is not usable until setUp is called."""
+ """TestingChrootServer is not usable until start_server is called."""
- def setUp(self, backing_server=None):
+ 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())
@@ -187,7 +187,7 @@
self.backing_transport = get_transport('.')
self.backing_transport.clone('added-by-filter').ensure_base()
self.filter_func = lambda x: 'added-by-filter/' + x
- PathFilteringServer.setUp(self)
+ PathFilteringServer.start_server(self)
def get_test_permutations():
=== modified file 'bzrlib/transport/sftp.py'
--- a/bzrlib/transport/sftp.py 2009-11-11 07:35:08 +0000
+++ b/bzrlib/transport/sftp.py 2010-01-07 03:03:01 +0000
@@ -1078,7 +1078,7 @@
ssh_server.start_server(event, server)
event.wait(5.0)
- def setUp(self, backing_server=None):
+ def start_server(self, backing_server=None):
# XXX: TODO: make sftpserver back onto backing_server rather than local
# disk.
if not (backing_server is None or
@@ -1103,8 +1103,7 @@
self._listener.setDaemon(True)
self._listener.start()
- def tearDown(self):
- """See bzrlib.transport.Server.tearDown."""
+ def stop_server(self):
self._listener.stop()
ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
@@ -1203,9 +1202,9 @@
It does this by serving from a deeply-nested directory that doesn't exist.
"""
- def setUp(self, backing_server=None):
+ def start_server(self, backing_server=None):
self._server_homedir = '/dev/noone/runs/tests/here'
- super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
+ super(SFTPSiblingAbsoluteServer, self).start_server(backing_server)
def get_test_permutations():
More information about the bazaar-commits
mailing list