[Zodb-checkins] SVN: ZODB/trunk/src/ZEO/tests/forker.py Fixed shutdown_zeo_server(), on FreeBSD 5.3 it raised timeout error

[Dmitry Vasiliev]

Log message for revision 41420:
  Fixed shutdown_zeo_server(), on FreeBSD 5.3 it raised timeout error
  in the second iteration
  

Changed:
  U   ZODB/trunk/src/ZEO/tests/forker.py

-=-
Modified: ZODB/trunk/src/ZEO/tests/forker.py
===================================================================
--- ZODB/trunk/src/ZEO/tests/forker.py	2006-01-22 18:36:56 UTC (rev 41419)
+++ ZODB/trunk/src/ZEO/tests/forker.py	2006-01-23 14:04:03 UTC (rev 41420)
@@ -176,8 +176,14 @@
     # superstition.
     for i in range(3):
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.settimeout(.3)
         try:
             s.connect(adminaddr)
+        except socket.timeout:
+            # On FreeBSD 5.3 the connection just timed out
+            if i > 0:
+                break
+            raise
         except socket.error, e:
             if e[0] == errno.ECONNREFUSED and i > 0:
                 break