Rev 5296: Fixed as per jam's review. in file:///home/vila/src/bzr/experimental/leaking-tests/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Jun 30 16:19:36 BST 2010
At file:///home/vila/src/bzr/experimental/leaking-tests/
------------------------------------------------------------
revno: 5296
revision-id: v.ladeuil+lp at free.fr-20100630151936-bwh082le0i52p8ez
parent: v.ladeuil+lp at free.fr-20100630150223-c66kbhyonzxk3gkf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: propagate-exceptions
timestamp: Wed 2010-06-30 17:19:36 +0200
message:
Fixed as per jam's review.
* bzrlib/tests/test_server.py:
* bzrlib/tests/test_http.py:
* bzrlib/tests/http_server.py:
* bzrlib/tests/ftp_server/pyftpdlib_based.py:
* bzrlib/tests/ftp_server/medusa_based.py:
Use sys.stderr.write() rather than print for thread dbugging trace.
* bzrlib/osutils.py:
(connect_socket): Remove the timeout parameter.
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2010-06-30 15:02:23 +0000
+++ b/bzrlib/osutils.py 2010-06-30 15:19:36 +0000
@@ -2065,11 +2065,12 @@
report_activity(sent, 'write')
-def connect_socket(address, timeout=None):
- # Slight variation of the socket.create_connection() function (provided
- # by python-2.6) that can fail if getaddrinfo returns an empty list. We
- # also provide it for previous python versions. Also, we don't use the
- # timeout parameter so we don't implement it either.
+def connect_socket(address):
+ # Slight variation of the socket.create_connection() function (provided by
+ # python-2.6) that can fail if getaddrinfo returns an empty list. We also
+ # provide it for previous python versions. Also, we don't use the timeout
+ # parameter (provided by the python implementation) so we don't implement
+ # it either).
err = socket.error('getaddrinfo returns an empty list')
host, port = address
for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
=== modified file 'bzrlib/tests/ftp_server/medusa_based.py'
--- a/bzrlib/tests/ftp_server/medusa_based.py 2010-05-24 01:05:14 +0000
+++ b/bzrlib/tests/ftp_server/medusa_based.py 2010-06-30 15:19:36 +0000
@@ -255,7 +255,8 @@
target=FTPTestServer._asyncore_loop_ignore_EBADF,
kwargs={'timeout':0.1, 'count':10000})
if 'threads' in tests.selftest_debug_flags:
- print 'Thread started: %s' % (self._async_thread.ident,)
+ sys.stderr.write('Thread started: %s\n'
+ % (self._async_thread.ident,))
self._async_thread.setDaemon(True)
self._async_thread.start()
@@ -264,7 +265,8 @@
asyncore.close_all()
self._async_thread.join()
if 'threads' in tests.selftest_debug_flags:
- print 'Thread joined: %s' % (self._async_thread.ident,)
+ sys.stderr.write('Thread joined: %s\n'
+ % (self._async_thread.ident,))
@staticmethod
def _asyncore_loop_ignore_EBADF(*args, **kwargs):
=== modified file 'bzrlib/tests/ftp_server/pyftpdlib_based.py'
--- a/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-05-24 01:05:14 +0000
+++ b/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-06-30 15:19:36 +0000
@@ -185,7 +185,8 @@
self._ftpd_thread = threading.Thread(target=self._run_server,)
self._ftpd_thread.start()
if 'threads' in tests.selftest_debug_flags:
- print 'Thread started: %s' % (self._ftpd_thread.ident,)
+ sys.stderr.write('Thread started: %s\n'
+ % (self._ftpd_thread.ident,))
# Wait for the server thread to start (i.e release the lock)
self._ftpd_starting.acquire()
self._ftpd_starting.release()
@@ -199,7 +200,8 @@
self._ftpd_running = False
self._ftpd_thread.join()
if 'threads' in tests.selftest_debug_flags:
- print 'Thread joined: %s' % (self._ftpd_thread.ident,)
+ sys.stderr.write('Thread joined: %s\n'
+ % (self._ftpd_thread.ident,))
def _run_server(self):
"""Run the server until stop_server is called, shut it down properly then.
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py 2010-06-02 14:50:04 +0000
+++ b/bzrlib/tests/http_server.py 2010-06-30 15:19:36 +0000
@@ -375,21 +375,21 @@
self.serving.set()
self.is_shut_down.clear()
if 'threads' in tests.selftest_debug_flags:
- print 'Starting %r' % (self.server_address,)
+ sys.stderr.write('Starting %r\n' % (self.server_address,))
# We are listening and ready to accept connections
started.set()
while self.serving.isSet():
if 'threads' in tests.selftest_debug_flags:
- print 'Accepting on %r' % (self.server_address,)
+ sys.stderr.write('Accepting on %r\n' % (self.server_address,))
# Really a connection but the python framework is generic and
# call them requests
self.handle_request()
if 'threads' in tests.selftest_debug_flags:
- print 'Closing %r' % (self.server_address,)
+ sys.stderr.write('Closing %r\n' % (self.server_address,))
# Let's close the listening socket
self.server_close()
if 'threads' in tests.selftest_debug_flags:
- print 'Closed %r' % (self.server_address,)
+ sys.stderr.write('Closed %r\n' % (self.server_address,))
self.is_shut_down.set()
def join_thread(self, thread, timeout=2):
@@ -461,7 +461,8 @@
# Right, the socket is already down
pass
else:
- print 'exception in shutdown_client_socket: %r' % (e,)
+ sys.stderr.write('exception in shutdown_client_socket: %r\n'
+ % (e,))
raise
@@ -506,7 +507,8 @@
def process_request_thread(self, started, request, client_address):
if 'threads' in tests.selftest_debug_flags:
- print 'Processing: %s' % (threading.currentThread().name,)
+ sys.stderr.write('Processing: %s\n'
+ % (threading.currentThread().name,))
started.set()
SocketServer.ThreadingTCPServer.process_request_thread(
self, request, client_address)
@@ -524,7 +526,8 @@
args = (started, request, client_address))
t.name = '%s -> %s' % (client_address, self.server_address)
if 'threads' in tests.selftest_debug_flags:
- print 'Thread for: %s started' % (threading.currentThread().name,)
+ sys.stderr.write('Thread for: %s started\n'
+ % (threading.currentThread().name,))
client.append(t)
self.clients.append(client)
if self.daemon_threads:
@@ -540,7 +543,7 @@
# shutdown.
sock, addr, thread = client
if 'threads' in tests.selftest_debug_flags:
- print 'Try joining: %s' % (thread.name,)
+ sys.stderr.write('Try joining: %s\n' % (thread.name,))
self.join_thread(thread)
def server_bind(self):
@@ -666,11 +669,13 @@
started.wait()
if self._httpd is None:
if 'threads' in tests.selftest_debug_flags:
- print 'Server %s:% start failed ' % (self.host, self.port)
+ sys.stderr.write('Server %s:% start failed \n'
+ % (self.host, self.port))
else:
self._http_thread.name = self._http_base_url
if 'threads' in tests.selftest_debug_flags:
- print 'Thread started: %s' % (self._http_thread.name,)
+ sys.stderr.write('Thread started: %s\n'
+ % (self._http_thread.name,))
# If an exception occured during the server start, it will get raised
self._http_thread.join(timeout=0)
@@ -681,10 +686,12 @@
# The server has been started successfully, shut it down now
self._httpd.shutdown_server()
if 'threads' in tests.selftest_debug_flags:
- print 'Try joining: %s' % (self._http_thread.name,)
+ sys.stderr.write('Try joining: %s\n'
+ % (self._http_thread.name,))
self._httpd.join_thread(self._http_thread)
if 'threads' in tests.selftest_debug_flags:
- print 'Thread joined: %s' % (self._http_thread.name,)
+ sys.stderr.write('Thread joined: %s\n'
+ % (self._http_thread.name,))
def get_url(self):
"""See bzrlib.transport.Server.get_url."""
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2010-06-11 10:59:53 +0000
+++ b/bzrlib/tests/test_http.py 2010-06-30 15:19:36 +0000
@@ -236,7 +236,7 @@
event=self._ready, target=self._accept_read_and_reply)
self._thread.start()
if 'threads' in tests.selftest_debug_flags:
- print 'Thread started: %s' % (self._thread.ident,)
+ sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
self._ready.wait()
def _accept_read_and_reply(self):
@@ -266,7 +266,7 @@
self.port = None
self._thread.join()
if 'threads' in tests.selftest_debug_flags:
- print 'Thread joined: %s' % (self._thread.ident,)
+ sys.stderr.write('Thread joined: %s\n' % (self._thread.ident,))
class TestAuthHeader(tests.TestCase):
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py 2010-06-12 15:10:26 +0000
+++ b/bzrlib/tests/test_server.py 2010-06-30 15:19:36 +0000
@@ -506,7 +506,7 @@
t.start()
started.wait()
if debug_threads():
- print 'Client thread %s started' % (t.name,)
+ sys.stderr.write('Client thread %s started\n' % (t.name,))
# If an exception occured during the thread start, it will get raised.
t.pending_exception()
@@ -521,8 +521,8 @@
# shutdown. If an exception occurred in the thread it will be
# re-raised
if debug_threads():
- print 'Client thread %s will be joined' % (
- connection_thread.name,)
+ sys.stderr.write('Client thread %s will be joined\n'
+ % (connection_thread.name,))
connection_thread.join()
def set_ignored_exceptions(self, thread, ignored_exceptions):
@@ -569,7 +569,8 @@
self.server_address = self.server.server_address
self._server_thread.name = self.server.server_address
if debug_threads():
- print 'Server thread %s started' % (self._server_thread.name,)
+ sys.stderr.write('Server thread %s started\n'
+ % (self._server_thread.name,))
# If an exception occured during the server start, it will get raised,
# otherwise, the server is blocked on its accept() call.
self._server_thread.pending_exception()
@@ -591,8 +592,8 @@
self.server.ignored_exceptions_during_shutdown)
self.server.serving.clear()
if debug_threads():
- print 'Server thread %s will be joined' % (
- self._server_thread.name,)
+ sys.stderr.write('Server thread %s will be joined\n'
+ % (self._server_thread.name,))
# The server is listening for a last connection, let's give it:
last_conn = None
try:
More information about the bazaar-commits
mailing list