[Neo-report] r2247 vincent - in /trunk/neo: client/app.py tests/client/testClientApp.py

[nobody at svn.erp5.org]

Author: vincent
Date: Sat Aug 28 08:34:35 2010
New Revision: 2247

Log:
Trying to commit wrong transaction should raise.

Modified:
    trunk/neo/client/app.py
    trunk/neo/tests/client/testClientApp.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Sat Aug 28 08:34:35 2010
@@ -799,7 +799,8 @@ class Application(object):
     def tpc_finish(self, transaction, f=None):
         """Finish current transaction."""
         if self.local_var.txn is not transaction:
-            return
+            raise StorageTransactionError('tpc_finish called for wrong'
+                'transaction')
         self._load_lock_acquire()
         try:
             tid = self.local_var.tid

Modified: trunk/neo/tests/client/testClientApp.py
==============================================================================
--- trunk/neo/tests/client/testClientApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testClientApp.py [iso-8859-1] Sat Aug 28 08:34:35 2010
@@ -672,7 +672,7 @@ class ClientApplicationTests(NeoTestBase
         self.checkAbortTransaction(conn3)
 
     def test_tpc_finish1(self):
-        # ignore mismatch transaction
+        # transaction mismatch: raise
         app = self.getApp()
         tid = self.makeTID()
         txn = self.makeTransactionObject()
@@ -683,7 +683,7 @@ class ClientApplicationTests(NeoTestBase
         cell = Mock()
         app.pt = Mock({'getCellListForTID': (cell, cell)})
         app.cp = Mock({'getConnForCell': ReturnValues(None, cell)})
-        app.tpc_finish(txn)
+        self.assertRaises(StorageTransactionError, app.tpc_finish, txn)
         # no packet sent
         self.checkNoPacketSent(conn)
         self.checkNoPacketSent(app.master_conn)