Commit 1856d194 authored by Vincent Pelletier's avatar Vincent Pelletier

Replace StorageNode instance by a Mock object. Remove associated XXX.

Remove outdated TODOs: they are already implemented in the same test.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@342 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent c5523108
...@@ -111,18 +111,17 @@ class ClientEventHandlerTest(unittest.TestCase): ...@@ -111,18 +111,17 @@ class ClientEventHandlerTest(unittest.TestCase):
storage_ip = '127.0.0.1' storage_ip = '127.0.0.1'
storage_port = 10011 storage_port = 10011
fake_storage_node_uuid = self.getUUID() fake_storage_node_uuid = self.getUUID()
# XXX: Must be replaced by a Mock object, but application uses isinstance... fake_storage_node = Mock({'getUUID': fake_storage_node_uuid, 'getServer': (storage_ip, storage_port), 'getNodeType': STORAGE_NODE_TYPE})
fake_storage_node = StorageNode(uuid=fake_storage_node_uuid, server=(storage_ip, storage_port))
master_node_next_packet_id = 1 master_node_next_packet_id = 1
class App: class App:
primary_master_node = Mock({'getUUID': self.getUUID()}) primary_master_node = Mock({'getUUID': self.getUUID()})
nm = Mock({'getNodeByServer': fake_storage_node}) nm = Mock({'getNodeByServer': fake_storage_node})
cp = Mock({'removeConnection': None}) # TODO: Add expectation on parameter value (must be fake_storage_node) cp = Mock({'removeConnection': None})
master_conn = self.getConnection(next_id=ReturnValues(master_node_next_packet_id)) master_conn = self.getConnection(next_id=ReturnValues(master_node_next_packet_id))
app = App() app = App()
conn = self.getConnection(port=storage_port, ip=storage_ip) conn = self.getConnection(port=storage_port, ip=storage_ip)
key_1 = (id(conn), 0) key_1 = (id(conn), 0)
queue_1 = Mock({'put': None, '__hash__': 1}) # TODO: Add expectation on parameter value (must be key_1) queue_1 = Mock({'put': None, '__hash__': 1})
# Fake another Storage connection by adding 1 to id(conn) # Fake another Storage connection by adding 1 to id(conn)
key_2 = (id(conn) + 1, 0) key_2 = (id(conn) + 1, 0)
queue_2 = Mock({'put': None, '__hash__': 2}) queue_2 = Mock({'put': None, '__hash__': 2})
...@@ -155,7 +154,6 @@ class ClientEventHandlerTest(unittest.TestCase): ...@@ -155,7 +154,6 @@ class ClientEventHandlerTest(unittest.TestCase):
self.assertEqual(queue_1_put_call_list[0].getParam(0), (conn, None)) self.assertEqual(queue_1_put_call_list[0].getParam(0), (conn, None))
self.assertEqual(len(queue_2.mockGetNamedCalls('put')), 0) self.assertEqual(len(queue_2.mockGetNamedCalls('put')), 0)
def _testConnectionFailed(self, dispatcher, app, uuid=None, conn=None): def _testConnectionFailed(self, dispatcher, app, uuid=None, conn=None):
client_handler = ClientEventHandler(app, dispatcher) client_handler = ClientEventHandler(app, dispatcher)
if conn is None: if conn is None:
......
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