[Zodb-checkins] SVN: ZODB/trunk/src/Z Merge rev 30339 from 3.4 branch.

[Tim Peters]

Log message for revision 30340:
  Merge rev 30339 from 3.4 branch.
  
  ZEO/tests/zeoserver.py, log():  repair broken interface
  between old logging code and the use of Python's logging
  package.
  
  ZODB/tests/TransactionalUndoStorage.py, _exercise_info_indices():
  Jeez Louise, the new tests I added for undoInfo+undoLog work fine
  in ZODB, but break the ZRS tests(!).  They close the DB "too soon",
  and in one of the ZRS scenarios that leaves a recovering secondary
  without a primary to recover from.
  

Changed:
  U   ZODB/trunk/src/ZEO/tests/zeoserver.py
  U   ZODB/trunk/src/ZODB/tests/TransactionalUndoStorage.py

-=-
Modified: ZODB/trunk/src/ZEO/tests/zeoserver.py
===================================================================
--- ZODB/trunk/src/ZEO/tests/zeoserver.py	2005-05-12 15:51:04 UTC (rev 30339)
+++ ZODB/trunk/src/ZEO/tests/zeoserver.py	2005-05-12 15:53:39 UTC (rev 30340)
@@ -43,7 +43,7 @@
 
 def log(label, msg, *args):
     message = "(%s) %s" % (label, msg)
-    logger.debug(message, args)
+    logger.debug(message, *args)
 
 
 class ZEOTestServer(asyncore.dispatcher):

Modified: ZODB/trunk/src/ZODB/tests/TransactionalUndoStorage.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/TransactionalUndoStorage.py	2005-05-12 15:51:04 UTC (rev 30339)
+++ ZODB/trunk/src/ZODB/tests/TransactionalUndoStorage.py	2005-05-12 15:53:39 UTC (rev 30340)
@@ -773,7 +773,11 @@
         self.assertEqual(oddball, redundant)
 
         cn.close()
-        db.close()
+        # Caution:  don't close db; the framework does that.  If you close
+        # it here, the ZODB tests still work, but the ZRS RecoveryStorageTests
+        # fail (closing the DB here in those tests closes the ZRS primary
+        # before a ZRS secondary even starts, and then the latter can't
+        # find a server to recover from).
 
     def checkIndicesInUndoInfo(self):
         self._exercise_info_indices("undoInfo")