Commit f7739565 authored by Jeremy Hylton's avatar Jeremy Hylton

Cosmetic changes to ExceptionInSubAbortSub,

including some use of assert/fail methods instead of assert stmt.
parent 75ee5c7a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
""" """
Revision information: Revision information:
$Id: testTransaction.py,v 1.5 2002/03/12 19:44:13 k_vertigo Exp $ $Id: testTransaction.py,v 1.6 2002/04/12 18:22:45 jeremy Exp $
""" """
""" """
...@@ -44,9 +44,8 @@ TODO ...@@ -44,9 +44,8 @@ TODO
""" """
import unittest
from types import TupleType from types import TupleType
import unittest
from ZODB import Transaction from ZODB import Transaction
...@@ -467,31 +466,32 @@ class TransactionTests(unittest.TestCase): ...@@ -467,31 +466,32 @@ class TransactionTests(unittest.TestCase):
assert self.nosub1._p_jar.ctpc_abort == 1 assert self.nosub1._p_jar.ctpc_abort == 1
def testExceptionInSubAbortSub(self): def testExceptionInSubAbortSub(self):
self.sub1._p_jar = SubTransactionJar(errors='commit_sub') self.sub1._p_jar = SubTransactionJar(errors='commit_sub')
self.sub1.modify(nojar=1) self.sub1.modify(nojar=1)
get_transaction().commit(1) get_transaction().commit(1)
self.nosub1.modify() self.nosub1.modify()
self.sub2._p_jar = SubTransactionJar(errors='abort_sub') self.sub2._p_jar = SubTransactionJar(errors='abort_sub')
self.sub2.modify(nojar=1) self.sub2.modify(nojar=1)
get_transaction().commit(1) get_transaction().commit(1)
self.sub3.modify() self.sub3.modify()
try: try:
get_transaction().commit() get_transaction().commit()
except TestTxnException: pass except TestTxnException, err:
pass
else:
self.fail("expected transaction to fail")
# The last commit failed. If the commit_sub() method was
# called, then tpc_abort() should be called to abort the
# actual transaction. If not, then calling abort_sub() is
# sufficient.
if self.sub3._p_jar.ccommit_sub == 1: if self.sub3._p_jar.ccommit_sub == 1:
assert self.sub3._p_jar.ctpc_abort == 1 self.assertEqual(self.sub3._p_jar.ctpc_abort, 1)
else: else:
assert self.sub3._p_jar.cabort_sub == 1 self.assertEqual(self.sub3._p_jar.cabort_sub, 1)
### XXX ### XXX
def BUGtestExceptionInSubTpcBegin(self): def BUGtestExceptionInSubTpcBegin(self):
...@@ -603,15 +603,12 @@ class BasicJar: ...@@ -603,15 +603,12 @@ class BasicJar:
self.ccommit_sub = 0 self.ccommit_sub = 0
def check(self, method): def check(self, method):
if self.tracing: if self.tracing:
print '%s calling method %s'%(str(self.tracing),method) print '%s calling method %s'%(str(self.tracing),method)
if ((type(self.errors) is TupleType and method in self.errors)
if (type(self.errors) is TupleType and method in self.errors) or \ or method == self.errors):
method == self.errors: raise TestTxnException("error %s" % method)
raise TestTxnException(" error %s"%method)
## basic jar txn interface ## basic jar txn interface
......
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