Rev 5271: Fix some fallouts from previous fixes, all tests passing (no more http leaks). in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5271
revision-id: v.ladeuil+lp at free.fr-20100605102545-woq8deyokfl3q61z
parent: v.ladeuil+lp at free.fr-20100605090106-x5intbf9udhfpvwu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-05 12:25:45 +0200
message:
  Fix some fallouts from previous fixes, all tests passing (no more http leaks).
  
  * bzrlib/tests/test_test_server.py:
  (TestTCPServerInAThread): server_address has been replaced
  by (host, port).
  
  * bzrlib/tests/test_http.py:
  (SampleSocket.__init__): Define close() too.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2010-06-04 11:48:56 +0000
+++ b/bzrlib/tests/test_http.py	2010-06-05 10:25:45 +0000
@@ -1732,6 +1732,7 @@
         self.readfile = StringIO(socket_read_content)
         self.writefile = StringIO()
         self.writefile.close = lambda: None
+        self.close = lambda: None
 
     def makefile(self, mode='r', bufsize=None):
         if 'r' in mode:

=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-04 16:31:07 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-05 10:25:45 +0000
@@ -362,7 +362,7 @@
     def handle_error(self, request, client_address):
         # Stop serving and re-raise the last exception seen
         self.serving.clear()
-        self.sibling_class.handle_error(self, request, client_address)
+#        self.sibling_class.handle_error(self, request, client_address)
         raise
 
     # The following methods are called by the main thread

=== modified file 'bzrlib/tests/test_test_server.py'
--- a/bzrlib/tests/test_test_server.py	2010-06-03 18:32:06 +0000
+++ b/bzrlib/tests/test_test_server.py	2010-06-05 10:25:45 +0000
@@ -117,17 +117,18 @@
     def test_start_stop(self):
         server = self.get_server()
         client = self.get_client()
-        client.connect(server.server_address)
+        client.connect((server.host, server.port))
         server.stop_server()
         # since the server doesn't accept connections anymore attempting to
         # connect should fail
         client = self.get_client()
-        self.assertRaises(socket.error, client.connect, server.server_address)
+        self.assertRaises(socket.error,
+                          client.connect, (server.host, server.port))
 
     def test_client_talks_server_respond(self):
         server = self.get_server()
         client = self.get_client()
-        client.connect(server.server_address)
+        client.connect((server.host, server.port))
         self.assertIs(None, client.write('ping\n'))
         resp = client.read()
         self.assertClientAddr(client, server, 0)
@@ -159,7 +160,7 @@
             connection_handler_class=FailingConnectionHandler)
         # The server won't fail until a client connect
         client = self.get_client()
-        client.connect(server.server_address)
+        client.connect((server.host, server.port))
         try:
             # Now we must force the server to answer by sending the request and
             # waiting for some answer. But since we don't control when the