Commit 4c9fe1fb authored by Vincent Pelletier's avatar Vincent Pelletier

Remove unneeded definitions of app.dispatcher.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2630 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent d911e6a1
...@@ -388,7 +388,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -388,7 +388,6 @@ class ClientApplicationTests(NeoUnitTestBase):
'getNextId': 1, 'getNextId': 1,
'fakeReceived': packet, 'fakeReceived': packet,
}) })
app.dispatcher = Mock({ })
app.tpc_begin(transaction=txn, tid=None) app.tpc_begin(transaction=txn, tid=None)
self.checkAskNewTid(app.master_conn) self.checkAskNewTid(app.master_conn)
self.checkDispatcherRegisterCalled(app, app.master_conn) self.checkDispatcherRegisterCalled(app, app.master_conn)
...@@ -499,7 +498,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -499,7 +498,6 @@ class ClientApplicationTests(NeoUnitTestBase):
'getAddress': ('127.0.0.1', 0), 'getAddress': ('127.0.0.1', 0),
}) })
app.cp = self.getConnectionPool([(Mock(), conn)]) app.cp = self.getConnectionPool([(Mock(), conn)])
app.dispatcher = Mock()
self.assertRaises(NEOStorageError, app.tpc_vote, app.local_var.txn, self.assertRaises(NEOStorageError, app.tpc_vote, app.local_var.txn,
resolving_tryToResolveConflict) resolving_tryToResolveConflict)
self.checkAskPacket(conn, Packets.AskStoreTransaction) self.checkAskPacket(conn, Packets.AskStoreTransaction)
...@@ -522,7 +520,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -522,7 +520,6 @@ class ClientApplicationTests(NeoUnitTestBase):
'__repr__': 'FakeNode', '__repr__': 'FakeNode',
}) })
app.cp = self.getConnectionPool([(node, conn)]) app.cp = self.getConnectionPool([(node, conn)])
app.dispatcher = Mock()
app.tpc_vote(txn, resolving_tryToResolveConflict) app.tpc_vote(txn, resolving_tryToResolveConflict)
self.checkAskStoreTransaction(conn) self.checkAskStoreTransaction(conn)
self.checkDispatcherRegisterCalled(app, conn) self.checkDispatcherRegisterCalled(app, conn)
...@@ -618,7 +615,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -618,7 +615,6 @@ class ClientApplicationTests(NeoUnitTestBase):
'getConnForNode': ReturnValues(conn2, conn3, conn1), 'getConnForNode': ReturnValues(conn2, conn3, conn1),
'iterateForObject': [(node2, conn2), (node3, conn3), (node1, conn1)], 'iterateForObject': [(node2, conn2), (node3, conn3), (node1, conn1)],
}) })
app.dispatcher = Mock()
app.master_conn = Mock({'__hash__': 0}) app.master_conn = Mock({'__hash__': 0})
txn = self.makeTransactionObject() txn = self.makeTransactionObject()
app.local_var.txn, app.local_var.tid = txn, tid app.local_var.txn, app.local_var.tid = txn, tid
...@@ -678,7 +674,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -678,7 +674,6 @@ class ClientApplicationTests(NeoUnitTestBase):
self.vote_params = (transaction, tryToResolveConflict) self.vote_params = (transaction, tryToResolveConflict)
dummy_tryToResolveConflict = [] dummy_tryToResolveConflict = []
app.tpc_vote = voteDetector app.tpc_vote = voteDetector
app.dispatcher = Mock({})
app.local_var.txn_voted = True app.local_var.txn_voted = True
self.assertRaises(NEOStorageError, app.tpc_finish, txn, self.assertRaises(NEOStorageError, app.tpc_finish, txn,
dummy_tryToResolveConflict, hook) dummy_tryToResolveConflict, hook)
...@@ -715,7 +710,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -715,7 +710,6 @@ class ClientApplicationTests(NeoUnitTestBase):
'getAddress': ('127.0.0.1', 10010), 'getAddress': ('127.0.0.1', 10010),
'fakeReceived': packet, 'fakeReceived': packet,
}) })
app.dispatcher = Mock({})
app.local_var.txn_voted = True app.local_var.txn_voted = True
app.local_var.txn_finished = True app.local_var.txn_finished = True
app.tpc_finish(txn, None, hook) app.tpc_finish(txn, None, hook)
...@@ -1063,7 +1057,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -1063,7 +1057,6 @@ class ClientApplicationTests(NeoUnitTestBase):
def test_askStorage(self): def test_askStorage(self):
""" _askStorage is private but test it anyway """ """ _askStorage is private but test it anyway """
app = self.getApp('') app = self.getApp('')
app.dispatcher = Mock()
conn = Mock() conn = Mock()
self.test_ok = False self.test_ok = False
def _waitMessage_hook(app, conn, msg_id, handler=None): def _waitMessage_hook(app, conn, msg_id, handler=None):
...@@ -1081,7 +1074,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -1081,7 +1074,6 @@ class ClientApplicationTests(NeoUnitTestBase):
def test_askPrimary(self): def test_askPrimary(self):
""" _askPrimary is private but test it anyway """ """ _askPrimary is private but test it anyway """
app = self.getApp('') app = self.getApp('')
app.dispatcher = Mock()
conn = Mock() conn = Mock()
app.master_conn = conn app.master_conn = conn
app.primary_handler = Mock() app.primary_handler = Mock()
......
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