[Checkins] SVN: transaction/branches/chrism-py3/transaction/ make doctests pass
Chris McDonough
chrism at plope.com
Mon Sep 26 05:33:43 EST 2011
Log message for revision 122944:
make doctests pass
Changed:
U transaction/branches/chrism-py3/transaction/_transaction.py
U transaction/branches/chrism-py3/transaction/tests/doom.txt
U transaction/branches/chrism-py3/transaction/tests/savepoint.txt
U transaction/branches/chrism-py3/transaction/tests/test_transaction.py
U transaction/branches/chrism-py3/transaction/tests/test_weakset.py
-=-
Modified: transaction/branches/chrism-py3/transaction/_transaction.py
===================================================================
--- transaction/branches/chrism-py3/transaction/_transaction.py 2011-09-26 09:26:06 UTC (rev 122943)
+++ transaction/branches/chrism-py3/transaction/_transaction.py 2011-09-26 10:33:42 UTC (rev 122944)
@@ -315,7 +315,8 @@
def commit(self):
if self.status is Status.DOOMED:
- raise interfaces.DoomedTransaction()
+ raise interfaces.DoomedTransaction(
+ 'transaction doomed, cannot commit')
if self._savepoint2index:
self._invalidate_all_savepoints()
@@ -700,7 +701,8 @@
def rollback(self):
transaction = self.transaction
if transaction is None:
- raise interfaces.InvalidSavepointRollbackError
+ raise interfaces.InvalidSavepointRollbackError(
+ 'invalidated by a later savepoint')
transaction._remove_and_invalidate_after(self)
try:
Modified: transaction/branches/chrism-py3/transaction/tests/doom.txt
===================================================================
--- transaction/branches/chrism-py3/transaction/tests/doom.txt 2011-09-26 09:26:06 UTC (rev 122943)
+++ transaction/branches/chrism-py3/transaction/tests/doom.txt 2011-09-26 10:33:42 UTC (rev 122944)
@@ -79,10 +79,10 @@
>>> txn.commit() # doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
- DoomedTransaction
+ DoomedTransaction: transaction doomed, cannot commit
>>> txn.commit() # doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
- DoomedTransaction
+ DoomedTransaction: transaction doomed, cannot commit
But still leaves the data manager unchanged:
Modified: transaction/branches/chrism-py3/transaction/tests/savepoint.txt
===================================================================
--- transaction/branches/chrism-py3/transaction/tests/savepoint.txt 2011-09-26 09:26:06 UTC (rev 122943)
+++ transaction/branches/chrism-py3/transaction/tests/savepoint.txt 2011-09-26 10:33:42 UTC (rev 122944)
@@ -187,12 +187,12 @@
>>> savepoint2.rollback() #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
- InvalidSavepointRollbackError
+ InvalidSavepointRollbackError: invalidated by a later savepoint
>>> savepoint1.rollback() #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
- InvalidSavepointRollbackError
+ InvalidSavepointRollbackError: invalidated by a later savepoint
>>> transaction.abort()
Modified: transaction/branches/chrism-py3/transaction/tests/test_transaction.py
===================================================================
--- transaction/branches/chrism-py3/transaction/tests/test_transaction.py 2011-09-26 09:26:06 UTC (rev 122943)
+++ transaction/branches/chrism-py3/transaction/tests/test_transaction.py 2011-09-26 10:33:42 UTC (rev 122944)
@@ -463,7 +463,7 @@
... pass
>>> class FailingDataManager:
... def tpc_begin(self, txn, sub=False):
- ... raise CommitFailure
+ ... raise CommitFailure('failed')
... def abort(self, txn):
... pass
@@ -471,10 +471,10 @@
>>> t.join(FailingDataManager())
>>> t.addBeforeCommitHook(hook, '2')
- >>> t.commit() #doctest +IGNORE_EXCEPTION_DETAIL
+ >>> t.commit() #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
- CommitFailure
+ CommitFailure: failed
>>> log
["arg '2' kw1 'no_kw1' kw2 'no_kw2'"]
>>> reset_log()
@@ -601,7 +601,7 @@
... pass
>>> class FailingDataManager:
... def tpc_begin(self, txn):
- ... raise CommitFailure
+ ... raise CommitFailure('failed')
... def abort(self, txn):
... pass
@@ -609,10 +609,10 @@
>>> t.join(FailingDataManager())
>>> t.addAfterCommitHook(hook, '2')
- >>> t.commit() #doctest +IGNORE_EXCEPTION_DETAIL
+ >>> t.commit() #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
- CommitFailure
+ CommitFailure: failed
>>> log
["False arg '2' kw1 'no_kw1' kw2 'no_kw2'"]
>>> reset_log()
Modified: transaction/branches/chrism-py3/transaction/tests/test_weakset.py
===================================================================
--- transaction/branches/chrism-py3/transaction/tests/test_weakset.py 2011-09-26 09:26:06 UTC (rev 122943)
+++ transaction/branches/chrism-py3/transaction/tests/test_weakset.py 2011-09-26 10:33:42 UTC (rev 122944)
@@ -56,7 +56,7 @@
del dummy3
L = [x() for x in w.as_weakref_list()]
# L is a list, but it does not have a guaranteed order.
- self.assert_(list, type(L))
+ self.assertTrue(list, type(L))
self.assertEqual(set(L), set([dummy, dummy2]))
def test_map(self):
More information about the checkins
mailing list