[Zope3-checkins] CVS: ZODB/src/ZODB/tests - testTransaction.py:1.23

[Tim Peters]

Update of /cvs-repository/ZODB/src/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv5968/src/ZODB/tests

Modified Files:
	testTransaction.py 
Log Message:
_commitResources() and _cleanup():  When an exception occurs during
the former, remember it and raise it after calling _cleanup.  If
abort_sub() or tpc_abort() in _cleanup() also raise exceptions, log
them but don't propagate them.

This stops stray output produced by tests testExceptionInTpcAbort and
testExceptionInSubAbortSub.

Grrrrr:  I haven't yet been able to figure out how to get logging to work
in ZODB, so haven't yet been able to check that the new logging is
reasonable.


=== ZODB/src/ZODB/tests/testTransaction.py 1.22 => 1.23 ===
--- ZODB/src/ZODB/tests/testTransaction.py:1.22	Fri Apr  2 14:48:22 2004
+++ ZODB/src/ZODB/tests/testTransaction.py	Mon Apr  5 21:06:41 2004
@@ -385,9 +385,6 @@
         self.sub1.modify(nojar=1)
 
         try:
-            # XXX Transaction._cleanup() prints a stray "error tpc_abort"
-            # XXX (the string value of the TestTxnException instance raised)
-            # XXX to stdout.
             get_transaction().commit()
         except TestTxnException:
             pass