[Zodb-checkins] CVS: ZODB3/ZEO/tests - CommitLockTests.py:1.12.20.1 forker.py:1.37.8.1

[Jeremy Hylton]

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

Modified Files:
      Tag: zodb33-devel-branch
	CommitLockTests.py forker.py 
Log Message:
Track module moves from ZODB to Persistence.

Add a few quick hacks to the BTrees code to get them to compile.


=== ZODB3/ZEO/tests/CommitLockTests.py 1.12 => 1.12.20.1 ===
--- ZODB3/ZEO/tests/CommitLockTests.py:1.12	Wed Jan 15 13:19:16 2003
+++ ZODB3/ZEO/tests/CommitLockTests.py	Tue Jul  1 15:34:09 2003
@@ -17,7 +17,7 @@
 import time
 
 from ZODB.Transaction import Transaction
-from ZODB.TimeStamp import TimeStamp
+from Persistence.TimeStamp import TimeStamp
 from ZODB.tests.StorageTestBase import zodb_pickle, MinPO
 
 import ZEO.ClientStorage


=== ZODB3/ZEO/tests/forker.py 1.37 => 1.37.8.1 ===
--- ZODB3/ZEO/tests/forker.py:1.37	Fri May 30 13:40:30 2003
+++ ZODB3/ZEO/tests/forker.py	Tue Jul  1 15:34:09 2003
@@ -93,8 +93,10 @@
     d['PYTHONPATH'] = os.pathsep.join(sys.path)
     pid = os.spawnve(os.P_NOWAIT, sys.executable, tuple(args), d)
     adminaddr = ('localhost', port + 1)
-    # We need to wait until the server starts, but not forever
-    for i in range(20):
+    # We need to wait until the server starts, but not forever.
+    # A Berkeley database can take a long time to open, so wait
+    # up to 30 seconds.
+    for i in range(120):
         time.sleep(0.25)
         try:
             zLOG.LOG('forker', zLOG.DEBUG, 'connect %s' % i)