[Zope3-checkins] CVS: ZODB4/ZODB/tests - MTStorage.py:1.10

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv3823

Modified Files:
	MTStorage.py 
Log Message:
Merge robustness changes from ZODB3.


=== ZODB4/ZODB/tests/MTStorage.py 1.9 => 1.10 ===
--- ZODB4/ZODB/tests/MTStorage.py:1.9	Mon Aug  5 16:08:38 2002
+++ ZODB4/ZODB/tests/MTStorage.py	Tue Dec  3 16:45:03 2002
@@ -38,6 +38,7 @@
 
     def __init__(self, db, test, commits=10, delay=SHORT_DELAY):
         self.__super_init()
+        self.setDaemon(1)
         self.db = db
         self.test = test
         self.commits = commits
@@ -183,7 +184,9 @@
         for t in threads:
             t.start()
         for t in threads:
-            t.join()
+            t.join(60)
+        for t in threads:
+            self.failIf(t.isAlive(), "thread failed to finish in 60 seconds")
     
     def check2ZODBThreads(self):
         db = ZODB.DB.DB(self._storage)