Commit d48ae53a authored by Tim Peters's avatar Tim Peters

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.
parent 58ae1f42
......@@ -43,7 +43,7 @@ logger = logging.getLogger('ZEO.tests.zeoserver')
def log(label, msg, *args):
message = "(%s) %s" % (label, msg)
logger.debug(message, args)
logger.debug(message, *args)
class ZEOTestServer(asyncore.dispatcher):
......
......@@ -773,7 +773,11 @@ class TransactionalUndoStorage:
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")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment