[Neo-report] r2523 vincent - /trunk/neo/tests/client/testClientApp.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 13 14:21:27 CET 2010
Author: vincent
Date: Mon Dec 13 14:21:27 2010
New Revision: 2523
Log:
Fix answer packet type, but with mismatching payload.
Rationale: dispatcher will refuse answer of a type which doesn't match
request, and this is tested separately.
Also, remove now-useless references to txn_finished.
Fixes regressions introduced in r2517.
Modified:
trunk/neo/tests/client/testClientApp.py
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] Mon Dec 13 14:21:27 2010
@@ -511,7 +511,7 @@ class ClientApplicationTests(NeoUnitTest
app.local_var.txn = txn
app.local_var.tid = tid
# wrong answer -> failure
- packet = Packets.AnswerTIDs(())
+ packet = Packets.AnswerStoreTransaction(INVALID_TID)
packet.setId(0)
conn = Mock({
'getNextId': 1,
@@ -599,7 +599,6 @@ class ClientApplicationTests(NeoUnitTest
self.assertEquals(app.local_var.txn, None)
self.assertEquals(app.local_var.data_dict, {})
self.assertEquals(app.local_var.txn_voted, False)
- self.assertEquals(app.local_var.txn_finished, False)
def test_tpc_abort3(self):
""" check that abort is sent to all nodes involved in the transaction """
@@ -694,7 +693,7 @@ class ClientApplicationTests(NeoUnitTest
def hook(tid):
self.f_called = True
self.f_called_with_tid = tid
- packet = Packets.AnswerBeginTransaction(INVALID_TID)
+ packet = Packets.AnswerTransactionFinished(INVALID_TID)
packet.setId(0)
app.master_conn = Mock({
'getNextId': 1,
@@ -709,7 +708,6 @@ class ClientApplicationTests(NeoUnitTest
app.tpc_vote = voteDetector
app.dispatcher = Mock({})
app.local_var.txn_voted = True
- app.local_var.txn_finished = False
self.assertRaises(NEOStorageError, app.tpc_finish, txn,
dummy_tryToResolveConflict, hook)
self.assertTrue(self.f_called)
@@ -719,7 +717,6 @@ class ClientApplicationTests(NeoUnitTest
self.checkDispatcherRegisterCalled(app, app.master_conn)
# Call again, but this time transaction is not voted yet
app.local_var.txn_voted = False
- app.local_var.txn_finished = False
self.f_called = False
self.assertRaises(NEOStorageError, app.tpc_finish, txn,
dummy_tryToResolveConflict, hook)
@@ -758,7 +755,6 @@ class ClientApplicationTests(NeoUnitTest
self.assertEquals(app.local_var.txn, None)
self.assertEquals(app.local_var.data_dict, {})
self.assertEquals(app.local_var.txn_voted, False)
- self.assertEquals(app.local_var.txn_finished, False)
def test_undo1(self):
# invalid transaction
More information about the Neo-report
mailing list