Rev 4736: Fixed as per Andrew's review. in file:///home/vila/src/bzr/bugs/405745-http-hangs/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/405745-http-hangs/

------------------------------------------------------------
revno: 4736
revision-id: v.ladeuil+lp at free.fr-20091012154825-wm80yyjc2pd4mjrn
parent: v.ladeuil+lp at free.fr-20091008082947-avilzu93drofi82n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 405745-http-hangs
timestamp: Mon 2009-10-12 17:48:25 +0200
message:
  Fixed as per Andrew's review.
  
  * bzrlib/tests/http_server.py:
  (TestingHTTPServerMixin.connect_socket): Be less dirty to handle
  the socket errors.
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2009-10-08 08:29:47 +0000
+++ b/bzrlib/tests/http_server.py	2009-10-12 15:48:25 +0000
@@ -343,7 +343,7 @@
         self.is_shut_down.set()
 
     def connect_socket(self):
-        msg = "getaddrinfo returns an empty list"
+        err = socket.error('getaddrinfo returns an empty list')
         for res in socket.getaddrinfo(*self.server_address):
             af, socktype, proto, canonname, sa = res
             sock = None
@@ -352,10 +352,11 @@
                 sock.connect(sa)
                 return sock
 
-            except socket.error, msg:
+            except socket.error, err:
+                # 'err' is now the most recent error
                 if sock is not None:
                     sock.close()
-        raise socket.error, msg
+        raise err
 
     def shutdown(self):
         """Stops the serve() loop.