[Zodb-checkins] CVS: ZODB3/ZEO/tests - testZEO.py:1.54.2.7

[Tim Peters]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv18544/ZEO/tests

Modified Files:
      Tag: ZODB3-3_1-branch
	testZEO.py 
Log Message:
WindowsTests.tearDown():  Boost the # of times we wait for the server to
die.  Printing out progress showed that it wasn't nearly large enough,
and that the new setting is -- at least on my box.  It remains a hack;
ZODB4 has a saner approach.


=== ZODB3/ZEO/tests/testZEO.py 1.54.2.6 => 1.54.2.7 ===
--- ZODB3/ZEO/tests/testZEO.py:1.54.2.6	Mon Jul 28 13:47:35 2003
+++ ZODB3/ZEO/tests/testZEO.py	Mon Jul 28 13:53:11 2003
@@ -213,8 +213,13 @@
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.connect(self.test_addr)
         s.close()
-        # the connection should cause the storage server to die
-        for countdown in (5, 4, 3, 2, 1, 0):
+        # The connection should cause the storage server to die.  On
+        # Windows, the files can't be deleted before the server dies,
+        # so we may try to delete them several times (ZODB4 has a
+        # better way to shut ZEO down).  I've (Tim) seen this loop
+        # need to go around 16 times on Win2K; starting at 30 gives
+        # some breathing room.
+        for countdown in xrange(30, -1, -1):
             try:
                 self.delStorage()
                 break