Skip to content

N
neo
Commit 22f00fe1 authored by Grégory Wisniewski's avatar Grégory Wisniewski
Browse files
Options

Fix tests with _addPacket instead of addPacket. 


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@516 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 421d5c65
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 97 deletions
neo/client/tests/testClientApp.py
View file @ 22f00fe1
...@@ -158,7 +158,7 @@ class ClientApplicationTest(unittest.TestCase): ...@@ -158,7 +158,7 @@ class ClientApplicationTest(unittest.TestCase):
self.assertTrue(calls[0].getParam(0) is conn) self.assertTrue(calls[0].getParam(0) is conn)
self.assertEquals(calls[0].getParam(2), app.local_var.queue) self.assertEquals(calls[0].getParam(2), app.local_var.queue)
def checkPacketSent(self, conn, packet_type, method='addPacket'): def checkPacketSent(self, conn, packet_type, method='_addPacket'):
calls = conn.mockGetNamedCalls(method) calls = conn.mockGetNamedCalls(method)
self.assertEquals(len(calls), 1) self.assertEquals(len(calls), 1)
packet = calls[0].getParam(0) packet = calls[0].getParam(0)
...@@ -202,7 +202,7 @@ class ClientApplicationTest(unittest.TestCase): ...@@ -202,7 +202,7 @@ class ClientApplicationTest(unittest.TestCase):
test_msg_id = 50 test_msg_id = 50
test_oid_list = ['\x00\x00\x00\x00\x00\x00\x00\x01', '\x00\x00\x00\x00\x00\x00\x00\x02'] test_oid_list = ['\x00\x00\x00\x00\x00\x00\x00\x01', '\x00\x00\x00\x00\x00\x00\x00\x02']
response_packet = protocol.answerNewOIDs(test_oid_list[:]) response_packet = protocol.answerNewOIDs(test_oid_list[:])
app.master_conn = Mock({'getNextId': test_msg_id, 'addPacket': None, app.master_conn = Mock({'getNextId': test_msg_id, '_addPacket': None,
'expectMessage': None, 'lock': None, 'expectMessage': None, 'lock': None,
'unlock': None, 'unlock': None,
# Test-specific method # Test-specific method
...@@ -271,7 +271,7 @@ class ClientApplicationTest(unittest.TestCase): ...@@ -271,7 +271,7 @@ class ClientApplicationTest(unittest.TestCase):
app.cp = Mock({ 'getConnForNode' : conn}) app.cp = Mock({ 'getConnForNode' : conn})
result = app.load(oid) result = app.load(oid)
self.assertEquals(result, ('', tid1)) self.assertEquals(result, ('', tid1))
self.assertEquals(len(conn.mockGetNamedCalls('addPacket')), 0) self.assertEquals(len(conn.mockGetNamedCalls('_addPacket')), 0)
def test_loadSerial(self): def test_loadSerial(self):
app = self.getApp() app = self.getApp()
......
neo/client/tests/testClientHandler.py
View file @ 22f00fe1
...@@ -60,7 +60,7 @@ class BaseClientEventHandlerTest(unittest.TestCase): ...@@ -60,7 +60,7 @@ class BaseClientEventHandlerTest(unittest.TestCase):
def getConnection(self, uuid=None, port=10010, next_id=None, ip='127.0.0.1'): def getConnection(self, uuid=None, port=10010, next_id=None, ip='127.0.0.1'):
if uuid is None: if uuid is None:
uuid = self.getUUID() uuid = self.getUUID()
return Mock({'addPacket': None, return Mock({'_addPacket': None,
'getUUID': uuid, 'getUUID': uuid,
'getAddress': (ip, port), 'getAddress': (ip, port),
'getNextId': next_id, 'getNextId': next_id,
...@@ -77,7 +77,7 @@ class ClientEventHandlerTest(unittest.TestCase): ...@@ -77,7 +77,7 @@ class ClientEventHandlerTest(unittest.TestCase):
def getConnection(self, uuid=None, port=10010, next_id=None, ip='127.0.0.1'): def getConnection(self, uuid=None, port=10010, next_id=None, ip='127.0.0.1'):
if uuid is None: if uuid is None:
uuid = self.getUUID() uuid = self.getUUID()
return Mock({'addPacket': None, return Mock({'_addPacket': None,
'getUUID': uuid, 'getUUID': uuid,
'getAddress': (ip, port), 'getAddress': (ip, port),
'getNextId': next_id, 'getNextId': next_id,
...@@ -138,7 +138,7 @@ class ClientEventHandlerTest(unittest.TestCase): ...@@ -138,7 +138,7 @@ class ClientEventHandlerTest(unittest.TestCase):
nm = Mock({'getNodeByServer': fake_storage_node}) nm = Mock({'getNodeByServer': fake_storage_node})
cp = Mock({'removeConnection': None}) cp = Mock({'removeConnection': None})
master_conn = Mock({ master_conn = Mock({
'addPacket': None, '_addPacket': None,
'getUUID': self.getUUID(), 'getUUID': self.getUUID(),
'getAddress': ('127.0.0.1', 10010), 'getAddress': ('127.0.0.1', 10010),
'getNextId': master_node_next_packet_id, 'getNextId': master_node_next_packet_id,
......
neo/master/tests/testMasterApp.py
View file @ 22f00fe1
...@@ -160,7 +160,7 @@ server: 127.0.0.1:10023 ...@@ -160,7 +160,7 @@ server: 127.0.0.1:10023
c_node = ClientNode(uuid = self.getNewUUID()) c_node = ClientNode(uuid = self.getNewUUID())
self.app.broadcastNodeInformation(c_node) self.app.broadcastNodeInformation(c_node)
# check conn # check conn
self.assertEquals(len(client_conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(client_conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(master_conn.mockGetNamedCalls("notify")), 1) self.assertEquals(len(master_conn.mockGetNamedCalls("notify")), 1)
call = master_conn.mockGetNamedCalls("notify")[0] call = master_conn.mockGetNamedCalls("notify")[0]
packet = call.getParam(0) packet = call.getParam(0)
...@@ -180,7 +180,7 @@ server: 127.0.0.1:10023 ...@@ -180,7 +180,7 @@ server: 127.0.0.1:10023
s_node = ClientNode(uuid = self.getNewUUID(), server=("127.1.0.1", 3361)) s_node = ClientNode(uuid = self.getNewUUID(), server=("127.1.0.1", 3361))
self.app.broadcastNodeInformation(c_node) self.app.broadcastNodeInformation(c_node)
# check conn # check conn
self.assertEquals(len(client_conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(client_conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(master_conn.mockGetNamedCalls("notify")), 1) self.assertEquals(len(master_conn.mockGetNamedCalls("notify")), 1)
call = master_conn.mockGetNamedCalls("notify")[0] call = master_conn.mockGetNamedCalls("notify")[0]
packet = call.getParam(0) packet = call.getParam(0)
......
neo/master/tests/testMasterRecoveryHandler.py
View file @ 22f00fe1
...@@ -139,7 +139,7 @@ server: 127.0.0.1:10023 ...@@ -139,7 +139,7 @@ server: 127.0.0.1:10023
args = (node_type, uuid, ip, port,self.app.name) args = (node_type, uuid, ip, port,self.app.name)
packet = protocol.requestNodeIdentification(*args) packet = protocol.requestNodeIdentification(*args)
# test alien cluster # test alien cluster
conn = Mock({"addPacket" : None, "abort" : None, "expectMessage" : None}) conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
self.recovery.handleRequestNodeIdentification(conn, packet, *args) self.recovery.handleRequestNodeIdentification(conn, packet, *args)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
return uuid return uuid
...@@ -176,17 +176,17 @@ server: 127.0.0.1:10023 ...@@ -176,17 +176,17 @@ server: 127.0.0.1:10023
# Method to test the kind of packet returned in answer # Method to test the kind of packet returned in answer
def checkCalledRequestNodeIdentification(self, conn, packet_number=0): def checkCalledRequestNodeIdentification(self, conn, packet_number=0):
""" Check Request Node Identification has been send""" """ Check Request Node Identification has been send"""
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 1) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0) self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1)
call = conn.mockGetNamedCalls("addPacket")[packet_number] call = conn.mockGetNamedCalls("_addPacket")[packet_number]
packet = call.getParam(0) packet = call.getParam(0)
self.assertTrue(isinstance(packet, Packet)) self.assertTrue(isinstance(packet, Packet))
self.assertEquals(packet.getType(), REQUEST_NODE_IDENTIFICATION) self.assertEquals(packet.getType(), REQUEST_NODE_IDENTIFICATION)
def checkCalledAskPrimaryMaster(self, conn, packet_number=0): def checkCalledAskPrimaryMaster(self, conn, packet_number=0):
""" Check ask primary master has been send""" """ Check ask primary master has been send"""
call = conn.mockGetNamedCalls("addPacket")[packet_number] call = conn.mockGetNamedCalls("_addPacket")[packet_number]
packet = call.getParam(0) packet = call.getParam(0)
self.assertTrue(isinstance(packet, Packet)) self.assertTrue(isinstance(packet, Packet))
self.assertEquals(packet.getType(),ASK_PRIMARY_MASTER) self.assertEquals(packet.getType(),ASK_PRIMARY_MASTER)
...@@ -207,7 +207,7 @@ server: 127.0.0.1:10023 ...@@ -207,7 +207,7 @@ server: 127.0.0.1:10023
def checkCalledAnswerLastIDs(self, conn, packet_number=0): def checkCalledAnswerLastIDs(self, conn, packet_number=0):
""" Check start operation message has been send""" """ Check start operation message has been send"""
call = conn.mockGetNamedCalls("addPacket")[packet_number] call = conn.mockGetNamedCalls("_addPacket")[packet_number]
packet = call.getParam(0) packet = call.getParam(0)
self.assertTrue(isinstance(packet, Packet)) self.assertTrue(isinstance(packet, Packet))
self.assertEquals(packet.getType(), ANSWER_LAST_IDS) self.assertEquals(packet.getType(), ANSWER_LAST_IDS)
...@@ -253,7 +253,7 @@ server: 127.0.0.1:10023 ...@@ -253,7 +253,7 @@ server: 127.0.0.1:10023
args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.storage_port, "INVALID_NAME") args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.storage_port, "INVALID_NAME")
packet = protocol.requestNodeIdentification(*args) packet = protocol.requestNodeIdentification(*args)
# test alien cluster # test alien cluster
conn = Mock({"addPacket" : None, "abort" : None}) conn = Mock({"_addPacket" : None, "abort" : None})
self.checkProtocolErrorRaised( self.checkProtocolErrorRaised(
recovery.handleRequestNodeIdentification, recovery.handleRequestNodeIdentification,
conn, conn,
...@@ -265,7 +265,7 @@ server: 127.0.0.1:10023 ...@@ -265,7 +265,7 @@ server: 127.0.0.1:10023
name="INVALID_NAME",) name="INVALID_NAME",)
# test connection from a client node, rejectet # test connection from a client node, rejectet
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, "abort" : None, "expectMessage" : None}) conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
self.checkNotReadyErrorRaised( self.checkNotReadyErrorRaised(
recovery.handleRequestNodeIdentification, recovery.handleRequestNodeIdentification,
conn, conn,
...@@ -278,7 +278,7 @@ server: 127.0.0.1:10023 ...@@ -278,7 +278,7 @@ server: 127.0.0.1:10023
# 1. unknown storage node with known address, must be rejected # 1. unknown storage node with known address, must be rejected
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -302,7 +302,7 @@ server: 127.0.0.1:10023 ...@@ -302,7 +302,7 @@ server: 127.0.0.1:10023
# 2. unknown master node with known address, will be accepted # 2. unknown master node with known address, will be accepted
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -327,7 +327,7 @@ server: 127.0.0.1:10023 ...@@ -327,7 +327,7 @@ server: 127.0.0.1:10023
# 3. unknown master node with known address but different uuid, will be replaced # 3. unknown master node with known address but different uuid, will be replaced
old_uuid = uuid old_uuid = uuid
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -350,7 +350,7 @@ server: 127.0.0.1:10023 ...@@ -350,7 +350,7 @@ server: 127.0.0.1:10023
# 4. unknown master node with known address but different uuid and broken state, will be accepted # 4. unknown master node with known address but different uuid and broken state, will be accepted
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -379,7 +379,7 @@ server: 127.0.0.1:10023 ...@@ -379,7 +379,7 @@ server: 127.0.0.1:10023
known_uuid = uuid known_uuid = uuid
# 5. known by uuid, but different address -> conflict / new master # 5. known by uuid, but different address -> conflict / new master
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -409,7 +409,7 @@ server: 127.0.0.1:10023 ...@@ -409,7 +409,7 @@ server: 127.0.0.1:10023
self.assertNotEquals(new_uuid, uuid) self.assertNotEquals(new_uuid, uuid)
# 6.known by uuid, but different address and non running state -> conflict # 6.known by uuid, but different address and non running state -> conflict
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -433,7 +433,7 @@ server: 127.0.0.1:10023 ...@@ -433,7 +433,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
# 7. known node but broken # 7. known node but broken
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -457,7 +457,7 @@ server: 127.0.0.1:10023 ...@@ -457,7 +457,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
# 8. known node but down # 8. known node but down
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -486,7 +486,7 @@ server: 127.0.0.1:10023 ...@@ -486,7 +486,7 @@ server: 127.0.0.1:10023
# 9. New node # 9. New node
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -513,7 +513,7 @@ server: 127.0.0.1:10023 ...@@ -513,7 +513,7 @@ server: 127.0.0.1:10023
recovery = self.recovery recovery = self.recovery
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
...@@ -527,7 +527,7 @@ server: 127.0.0.1:10023 ...@@ -527,7 +527,7 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port) uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
...@@ -546,13 +546,13 @@ server: 127.0.0.1:10023 ...@@ -546,13 +546,13 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = Packet(msg_type=ANNOUNCE_PRIMARY_MASTER) packet = Packet(msg_type=ANNOUNCE_PRIMARY_MASTER)
# No uuid # No uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
self.checkIdenficationRequired(recovery.handleAnnouncePrimaryMaster, conn, packet) self.checkIdenficationRequired(recovery.handleAnnouncePrimaryMaster, conn, packet)
# announce # announce
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(self.app.primary, None) self.assertEqual(self.app.primary, None)
...@@ -565,7 +565,7 @@ server: 127.0.0.1:10023 ...@@ -565,7 +565,7 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
# No uuid # No uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertRaises(ElectionFailure, recovery.handleReelectPrimaryMaster, conn, packet) self.assertRaises(ElectionFailure, recovery.handleReelectPrimaryMaster, conn, packet)
...@@ -684,18 +684,18 @@ server: 127.0.0.1:10023 ...@@ -684,18 +684,18 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = Packet(msg_type=ANSWER_PARTITION_TABLE) packet = Packet(msg_type=ANSWER_PARTITION_TABLE)
# No uuid # No uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkIdenficationRequired(recovery.handleAnswerPartitionTable, conn, packet, None, []) self.checkIdenficationRequired(recovery.handleAnswerPartitionTable, conn, packet, None, [])
# not a storage node # not a storage node
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(recovery.handleAnswerPartitionTable, conn, packet, None, []) self.checkUnexpectedPacketRaised(recovery.handleAnswerPartitionTable, conn, packet, None, [])
# not from target node, ignore # not from target node, ignore
uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port) uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertNotEquals(self.app.target_uuid, uuid) self.assertNotEquals(self.app.target_uuid, uuid)
...@@ -709,7 +709,7 @@ server: 127.0.0.1:10023 ...@@ -709,7 +709,7 @@ server: 127.0.0.1:10023
for cell, state in cells: for cell, state in cells:
self.assertEquals(state, OUT_OF_DATE_STATE) self.assertEquals(state, OUT_OF_DATE_STATE)
# from target node, taken into account # from target node, taken into account
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertNotEquals(self.app.target_uuid, uuid) self.assertNotEquals(self.app.target_uuid, uuid)
...@@ -725,7 +725,7 @@ server: 127.0.0.1:10023 ...@@ -725,7 +725,7 @@ server: 127.0.0.1:10023
for cell, state in cells: for cell, state in cells:
self.assertEquals(state, UP_TO_DATE_STATE) self.assertEquals(state, UP_TO_DATE_STATE)
# give a bad offset, must send error # give a bad offset, must send error
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(self.app.target_uuid, uuid) self.assertEquals(self.app.target_uuid, uuid)
......
neo/master/tests/testMasterVerificationHandler.py
View file @ 22f00fe1
...@@ -171,7 +171,7 @@ server: 127.0.0.1:10023 ...@@ -171,7 +171,7 @@ server: 127.0.0.1:10023
args = (node_type, uuid, ip, port, self.app.name) args = (node_type, uuid, ip, port, self.app.name)
packet = protocol.requestNodeIdentification(*args) packet = protocol.requestNodeIdentification(*args)
# test alien cluster # test alien cluster
conn = Mock({"addPacket" : None, "abort" : None, "expectMessage" : None}) conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
self.verification.handleRequestNodeIdentification(conn, packet, *args) self.verification.handleRequestNodeIdentification(conn, packet, *args)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
return uuid return uuid
...@@ -179,10 +179,10 @@ server: 127.0.0.1:10023 ...@@ -179,10 +179,10 @@ server: 127.0.0.1:10023
# Method to test the kind of packet returned in answer # Method to test the kind of packet returned in answer
def checkCalledRequestNodeIdentification(self, conn, packet_number=0): def checkCalledRequestNodeIdentification(self, conn, packet_number=0):
""" Check Request Node Identification has been send""" """ Check Request Node Identification has been send"""
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 1) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0) self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1)
call = conn.mockGetNamedCalls("addPacket")[packet_number] call = conn.mockGetNamedCalls("_addPacket")[packet_number]
packet = call.getParam(0) packet = call.getParam(0)
self.assertTrue(isinstance(packet, Packet)) self.assertTrue(isinstance(packet, Packet))
self.assertEquals(packet.getType(), REQUEST_NODE_IDENTIFICATION) self.assertEquals(packet.getType(), REQUEST_NODE_IDENTIFICATION)
...@@ -190,7 +190,7 @@ server: 127.0.0.1:10023 ...@@ -190,7 +190,7 @@ server: 127.0.0.1:10023
def checkCalledAskPrimaryMaster(self, conn, packet_number=0): def checkCalledAskPrimaryMaster(self, conn, packet_number=0):
""" Check ask primary master has been send""" """ Check ask primary master has been send"""
call = conn.mockGetNamedCalls("addPacket")[packet_number] call = conn.mockGetNamedCalls("_addPacket")[packet_number]
packet = call.getParam(0) packet = call.getParam(0)
self.assertTrue(isinstance(packet, Packet)) self.assertTrue(isinstance(packet, Packet))
self.assertEquals(packet.getType(),ASK_PRIMARY_MASTER) self.assertEquals(packet.getType(),ASK_PRIMARY_MASTER)
...@@ -276,7 +276,7 @@ server: 127.0.0.1:10023 ...@@ -276,7 +276,7 @@ server: 127.0.0.1:10023
args = ( MASTER_NODE_TYPE, uuid, '127.0.0.1', self.storage_port, "INVALID_NAME") args = ( MASTER_NODE_TYPE, uuid, '127.0.0.1', self.storage_port, "INVALID_NAME")
packet = protocol.requestNodeIdentification(*args) packet = protocol.requestNodeIdentification(*args)
# test alien cluster # test alien cluster
conn = Mock({"addPacket" : None, "abort" : None}) conn = Mock({"_addPacket" : None, "abort" : None})
self.checkProtocolErrorRaised( self.checkProtocolErrorRaised(
verification.handleRequestNodeIdentification, verification.handleRequestNodeIdentification,
conn, packet=packet, conn, packet=packet,
...@@ -287,7 +287,7 @@ server: 127.0.0.1:10023 ...@@ -287,7 +287,7 @@ server: 127.0.0.1:10023
name="INVALID_NAME",) name="INVALID_NAME",)
# test connection from a client node, rejectet # test connection from a client node, rejectet
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, "abort" : None, "expectMessage" : None}) conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
self.checkNotReadyErrorRaised( self.checkNotReadyErrorRaised(
verification.handleRequestNodeIdentification, verification.handleRequestNodeIdentification,
conn, conn,
...@@ -300,7 +300,7 @@ server: 127.0.0.1:10023 ...@@ -300,7 +300,7 @@ server: 127.0.0.1:10023
# 1. unknown storage node with known address, must be rejected # 1. unknown storage node with known address, must be rejected
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -324,7 +324,7 @@ server: 127.0.0.1:10023 ...@@ -324,7 +324,7 @@ server: 127.0.0.1:10023
# 2. unknown master node with known address, will be accepted # 2. unknown master node with known address, will be accepted
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -349,7 +349,7 @@ server: 127.0.0.1:10023 ...@@ -349,7 +349,7 @@ server: 127.0.0.1:10023
# 3. unknown master node with known address but different uuid, will be replaced # 3. unknown master node with known address but different uuid, will be replaced
old_uuid = uuid old_uuid = uuid
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -372,7 +372,7 @@ server: 127.0.0.1:10023 ...@@ -372,7 +372,7 @@ server: 127.0.0.1:10023
# 4. unknown master node with known address but different uuid and broken state, will be accepted # 4. unknown master node with known address but different uuid and broken state, will be accepted
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -400,7 +400,7 @@ server: 127.0.0.1:10023 ...@@ -400,7 +400,7 @@ server: 127.0.0.1:10023
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
# 5. known by uuid, but different address # 5. known by uuid, but different address
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -430,7 +430,7 @@ server: 127.0.0.1:10023 ...@@ -430,7 +430,7 @@ server: 127.0.0.1:10023
self.assertNotEquals(new_uuid, uuid) self.assertNotEquals(new_uuid, uuid)
# 6.known by uuid, but different address and non running state # 6.known by uuid, but different address and non running state
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -454,7 +454,7 @@ server: 127.0.0.1:10023 ...@@ -454,7 +454,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
# 7. known node but broken # 7. known node but broken
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -478,7 +478,7 @@ server: 127.0.0.1:10023 ...@@ -478,7 +478,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
# 8. known node but down # 8. known node but down
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -507,7 +507,7 @@ server: 127.0.0.1:10023 ...@@ -507,7 +507,7 @@ server: 127.0.0.1:10023
# 9. New node # 9. New node
uuid = self.getNewUUID() uuid = self.getNewUUID()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
...@@ -534,7 +534,7 @@ server: 127.0.0.1:10023 ...@@ -534,7 +534,7 @@ server: 127.0.0.1:10023
verification = self.verification verification = self.verification
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
...@@ -547,7 +547,7 @@ server: 127.0.0.1:10023 ...@@ -547,7 +547,7 @@ server: 127.0.0.1:10023
# if storage node, expect messages # if storage node, expect messages
uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port) uuid = self.identifyToMasterNode(STORAGE_NODE_TYPE, port=self.storage_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
...@@ -565,13 +565,13 @@ server: 127.0.0.1:10023 ...@@ -565,13 +565,13 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = Packet(msg_type=ANNOUNCE_PRIMARY_MASTER) packet = Packet(msg_type=ANNOUNCE_PRIMARY_MASTER)
# No uuid # No uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
self.checkIdenficationRequired(verification.handleAnnouncePrimaryMaster, conn, packet) self.checkIdenficationRequired(verification.handleAnnouncePrimaryMaster, conn, packet)
# announce # announce
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertEqual(self.app.primary, None) self.assertEqual(self.app.primary, None)
...@@ -583,7 +583,7 @@ server: 127.0.0.1:10023 ...@@ -583,7 +583,7 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = protocol.askPrimaryMaster() packet = protocol.askPrimaryMaster()
# No uuid # No uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertRaises(ElectionFailure, verification.handleReelectPrimaryMaster, conn, packet) self.assertRaises(ElectionFailure, verification.handleReelectPrimaryMaster, conn, packet)
...@@ -696,7 +696,7 @@ server: 127.0.0.1:10023 ...@@ -696,7 +696,7 @@ server: 127.0.0.1:10023
verification = self.verification verification = self.verification
uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
packet = Packet(msg_type=ANSWER_PARTITION_TABLE, ) packet = Packet(msg_type=ANSWER_PARTITION_TABLE, )
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
verification.handleAnswerPartitionTable(conn, packet, None, []) verification.handleAnswerPartitionTable(conn, packet, None, [])
...@@ -707,18 +707,18 @@ server: 127.0.0.1:10023 ...@@ -707,18 +707,18 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode() uuid = self.identifyToMasterNode()
packet = Packet(msg_type=ANSWER_UNFINISHED_TRANSACTIONS) packet = Packet(msg_type=ANSWER_UNFINISHED_TRANSACTIONS)
# reject when no uuid # reject when no uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.checkIdenficationRequired(verification.handleAnswerUnfinishedTransactions, conn, packet, []) self.checkIdenficationRequired(verification.handleAnswerUnfinishedTransactions, conn, packet, [])
# reject master node # reject master node
master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : master_uuid, "getUUID" : master_uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(verification.handleAnswerUnfinishedTransactions, conn, packet, []) self.checkUnexpectedPacketRaised(verification.handleAnswerUnfinishedTransactions, conn, packet, [])
# do nothing # do nothing
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 0) self.assertEquals(len(self.app.asking_uuid_dict), 0)
...@@ -730,7 +730,7 @@ server: 127.0.0.1:10023 ...@@ -730,7 +730,7 @@ server: 127.0.0.1:10023
verification.handleAnswerUnfinishedTransactions(conn, packet, [new_tid]) verification.handleAnswerUnfinishedTransactions(conn, packet, [new_tid])
self.assertEquals(len(self.app.unfinished_tid_set), 0) self.assertEquals(len(self.app.unfinished_tid_set), 0)
# update dict # update dict
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.app.asking_uuid_dict[uuid] = False self.app.asking_uuid_dict[uuid] = False
...@@ -749,18 +749,18 @@ server: 127.0.0.1:10023 ...@@ -749,18 +749,18 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode() uuid = self.identifyToMasterNode()
packet = Packet(msg_type=ANSWER_TRANSACTION_INFORMATION) packet = Packet(msg_type=ANSWER_TRANSACTION_INFORMATION)
# reject when no uuid # reject when no uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.checkIdenficationRequired(verification.handleAnswerTransactionInformation, conn, packet, None, None, None, None, None) self.checkIdenficationRequired(verification.handleAnswerTransactionInformation, conn, packet, None, None, None, None, None)
# reject master node # reject master node
master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : master_uuid, "getUUID" : master_uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(verification.handleAnswerTransactionInformation, conn, packet, None, None, None, None, None) self.checkUnexpectedPacketRaised(verification.handleAnswerTransactionInformation, conn, packet, None, None, None, None, None)
# do nothing, as unfinished_oid_set is None # do nothing, as unfinished_oid_set is None
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 0) self.assertEquals(len(self.app.asking_uuid_dict), 0)
...@@ -775,7 +775,7 @@ server: 127.0.0.1:10023 ...@@ -775,7 +775,7 @@ server: 127.0.0.1:10023
"user", "desc", "ext", [new_oid,]) "user", "desc", "ext", [new_oid,])
self.assertEquals(self.app.unfinished_oid_set, None) self.assertEquals(self.app.unfinished_oid_set, None)
# do nothing as asking_uuid_dict is True # do nothing as asking_uuid_dict is True
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
...@@ -787,7 +787,7 @@ server: 127.0.0.1:10023 ...@@ -787,7 +787,7 @@ server: 127.0.0.1:10023
"user", "desc", "ext", [new_oid,]) "user", "desc", "ext", [new_oid,])
self.assertEquals(len(self.app.unfinished_oid_set), 0) self.assertEquals(len(self.app.unfinished_oid_set), 0)
# do work # do work
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
...@@ -799,7 +799,7 @@ server: 127.0.0.1:10023 ...@@ -799,7 +799,7 @@ server: 127.0.0.1:10023
self.assertEquals(len(self.app.unfinished_oid_set), 1) self.assertEquals(len(self.app.unfinished_oid_set), 1)
self.assertTrue(new_oid in self.app.unfinished_oid_set) self.assertTrue(new_oid in self.app.unfinished_oid_set)
# do not work as oid is diff # do not work as oid is diff
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
...@@ -819,18 +819,18 @@ server: 127.0.0.1:10023 ...@@ -819,18 +819,18 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode() uuid = self.identifyToMasterNode()
packet = Packet(msg_type=TID_NOT_FOUND_CODE) packet = Packet(msg_type=TID_NOT_FOUND_CODE)
# reject when no uuid # reject when no uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.checkIdenficationRequired(verification.handleTidNotFound, conn, packet, []) self.checkIdenficationRequired(verification.handleTidNotFound, conn, packet, [])
# reject master node # reject master node
master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : master_uuid, "getUUID" : master_uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(verification.handleTidNotFound, conn, packet, []) self.checkUnexpectedPacketRaised(verification.handleTidNotFound, conn, packet, [])
# do nothing as asking_uuid_dict is True # do nothing as asking_uuid_dict is True
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 0) self.assertEquals(len(self.app.asking_uuid_dict), 0)
...@@ -840,7 +840,7 @@ server: 127.0.0.1:10023 ...@@ -840,7 +840,7 @@ server: 127.0.0.1:10023
verification.handleTidNotFound(conn, packet, "msg") verification.handleTidNotFound(conn, packet, "msg")
self.assertNotEqual(self.app.unfinished_oid_set, None) self.assertNotEqual(self.app.unfinished_oid_set, None)
# do work as asking_uuid_dict is False # do work as asking_uuid_dict is False
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
...@@ -855,13 +855,13 @@ server: 127.0.0.1:10023 ...@@ -855,13 +855,13 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode() uuid = self.identifyToMasterNode()
packet = Packet(msg_type=ANSWER_OBJECT_PRESENT) packet = Packet(msg_type=ANSWER_OBJECT_PRESENT)
# reject when no uuid # reject when no uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.checkIdenficationRequired(verification.handleAnswerObjectPresent, conn, packet, None, None) self.checkIdenficationRequired(verification.handleAnswerObjectPresent, conn, packet, None, None)
# reject master node # reject master node
master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : master_uuid, "getUUID" : master_uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(verification.handleAnswerObjectPresent, conn, packet, None, None) self.checkUnexpectedPacketRaised(verification.handleAnswerObjectPresent, conn, packet, None, None)
...@@ -870,7 +870,7 @@ server: 127.0.0.1:10023 ...@@ -870,7 +870,7 @@ server: 127.0.0.1:10023
new_tid = pack('!LL', upper, lower + 10) new_tid = pack('!LL', upper, lower + 10)
oid = unpack('!Q', self.app.loid)[0] oid = unpack('!Q', self.app.loid)[0]
new_oid = pack('!Q', oid + 1) new_oid = pack('!Q', oid + 1)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 0) self.assertEquals(len(self.app.asking_uuid_dict), 0)
...@@ -878,7 +878,7 @@ server: 127.0.0.1:10023 ...@@ -878,7 +878,7 @@ server: 127.0.0.1:10023
self.assertTrue(self.app.asking_uuid_dict.has_key(uuid)) self.assertTrue(self.app.asking_uuid_dict.has_key(uuid))
verification.handleAnswerObjectPresent(conn, packet, new_oid, new_tid) verification.handleAnswerObjectPresent(conn, packet, new_oid, new_tid)
# do work # do work
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
...@@ -892,18 +892,18 @@ server: 127.0.0.1:10023 ...@@ -892,18 +892,18 @@ server: 127.0.0.1:10023
uuid = self.identifyToMasterNode() uuid = self.identifyToMasterNode()
packet = Packet(msg_type=OID_NOT_FOUND_CODE) packet = Packet(msg_type=OID_NOT_FOUND_CODE)
# reject when no uuid # reject when no uuid
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : None, "getUUID" : None,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.checkIdenficationRequired(verification.handleOidNotFound, conn, packet, []) self.checkIdenficationRequired(verification.handleOidNotFound, conn, packet, [])
# reject master node # reject master node
master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(MASTER_NODE_TYPE, port=self.master_port)
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : master_uuid, "getUUID" : master_uuid,
"getAddress" : ("127.0.0.1", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.checkUnexpectedPacketRaised(verification.handleOidNotFound, conn, packet, []) self.checkUnexpectedPacketRaised(verification.handleOidNotFound, conn, packet, [])
# do nothinf as asking_uuid_dict is True # do nothinf as asking_uuid_dict is True
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 0) self.assertEquals(len(self.app.asking_uuid_dict), 0)
...@@ -913,7 +913,7 @@ server: 127.0.0.1:10023 ...@@ -913,7 +913,7 @@ server: 127.0.0.1:10023
verification.handleOidNotFound(conn, packet, "msg") verification.handleOidNotFound(conn, packet, "msg")
self.assertTrue(self.app.object_present) self.assertTrue(self.app.object_present)
# do work as asking_uuid_dict is False # do work as asking_uuid_dict is False
conn = Mock({"addPacket" : None, conn = Mock({"_addPacket" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.1", self.storage_port)}) "getAddress" : ("127.0.0.1", self.storage_port)})
self.assertEquals(len(self.app.asking_uuid_dict), 1) self.assertEquals(len(self.app.asking_uuid_dict), 1)
......
neo/storage/tests/testStorageBootstrapHandler.py
View file @ 22f00fe1
...@@ -496,7 +496,7 @@ server: 127.0.0.1:10020 ...@@ -496,7 +496,7 @@ server: 127.0.0.1:10020
num_replicas=self.app.num_replicas, num_replicas=self.app.num_replicas,
**args) **args)
self.assertEquals(len(conn.mockGetNamedCalls("setUUID")), 0) self.assertEquals(len(conn.mockGetNamedCalls("setUUID")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
# create a new partition table # create a new partition table
self.bootstrap.handleAcceptNodeIdentification( self.bootstrap.handleAcceptNodeIdentification(
...@@ -595,7 +595,7 @@ server: 127.0.0.1:10020 ...@@ -595,7 +595,7 @@ server: 127.0.0.1:10020
self.assertEquals(n.getUUID(), new_master[2]) self.assertEquals(n.getUUID(), new_master[2])
self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0) self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0)
self.assertEquals(len(conn.mockGetNamedCalls('close')), 0) self.assertEquals(len(conn.mockGetNamedCalls('close')), 0)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_10_handleAnswerPrimaryMaster03(self): def test_10_handleAnswerPrimaryMaster03(self):
# invalid primary master uuid -> close connection # invalid primary master uuid -> close connection
...@@ -615,7 +615,7 @@ server: 127.0.0.1:10020 ...@@ -615,7 +615,7 @@ server: 127.0.0.1:10020
self.assertEquals(self.app.trying_master_node, None) self.assertEquals(self.app.trying_master_node, None)
self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0) self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0)
self.assertEquals(len(conn.mockGetNamedCalls('close')), 1) self.assertEquals(len(conn.mockGetNamedCalls('close')), 1)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_10_handleAnswerPrimaryMaster04(self): def test_10_handleAnswerPrimaryMaster04(self):
# trying_master_node is not pmn -> close connection # trying_master_node is not pmn -> close connection
...@@ -637,7 +637,7 @@ server: 127.0.0.1:10020 ...@@ -637,7 +637,7 @@ server: 127.0.0.1:10020
self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0) self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0)
self.assertEquals(len(conn.mockGetNamedCalls('close')), 1) self.assertEquals(len(conn.mockGetNamedCalls('close')), 1)
self.assertEquals(self.app.trying_master_node, None) self.assertEquals(self.app.trying_master_node, None)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_10_handleAnswerPrimaryMaster05(self): def test_10_handleAnswerPrimaryMaster05(self):
# trying_master_node is pmn -> set verification handler # trying_master_node is pmn -> set verification handler
...@@ -661,7 +661,7 @@ server: 127.0.0.1:10020 ...@@ -661,7 +661,7 @@ server: 127.0.0.1:10020
self.assertTrue(isinstance(call.getParam(0), VerificationEventHandler)) self.assertTrue(isinstance(call.getParam(0), VerificationEventHandler))
self.assertEquals(len(conn.mockGetNamedCalls('close')), 0) self.assertEquals(len(conn.mockGetNamedCalls('close')), 0)
self.assertEquals(self.app.trying_master_node, pmn) self.assertEquals(self.app.trying_master_node, pmn)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_10_handleAnswerPrimaryMaster06(self): def test_10_handleAnswerPrimaryMaster06(self):
# primary_uuid not known -> nothing happen # primary_uuid not known -> nothing happen
...@@ -681,7 +681,7 @@ server: 127.0.0.1:10020 ...@@ -681,7 +681,7 @@ server: 127.0.0.1:10020
self.assertEquals(self.app.trying_master_node, None) self.assertEquals(self.app.trying_master_node, None)
self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0) self.assertEquals(len(conn.mockGetNamedCalls('setHandler')), 0)
self.assertEquals(len(conn.mockGetNamedCalls('close')), 0) self.assertEquals(len(conn.mockGetNamedCalls('close')), 0)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
......
neo/storage/tests/testStorageOperation.py
View file @ 22f00fe1
...@@ -752,7 +752,7 @@ server: 127.0.0.1:10020 ...@@ -752,7 +752,7 @@ server: 127.0.0.1:10020
serial=INVALID_SERIAL, serial=INVALID_SERIAL,
tid=INVALID_TID) tid=INVALID_TID)
self.assertEquals(len(self.app.event_queue), 1) self.assertEquals(len(self.app.event_queue), 1)
self.assertEquals(len(conn.mockGetNamedCalls('addPacket')), 0) self.assertEquals(len(conn.mockGetNamedCalls('_addPacket')), 0)
self.assertEquals(len(self.app.dm.mockGetNamedCalls('getObject')), 0) self.assertEquals(len(self.app.dm.mockGetNamedCalls('getObject')), 0)
def test_24_handleAskObject2(self): def test_24_handleAskObject2(self):
...@@ -918,7 +918,7 @@ server: 127.0.0.1:10020 ...@@ -918,7 +918,7 @@ server: 127.0.0.1:10020
self.assertEquals(len(self.app.event_queue), 1) self.assertEquals(len(self.app.event_queue), 1)
t_after = self.app.transaction_dict.items()[:] t_after = self.app.transaction_dict.items()[:]
self.assertEquals(t_before, t_after) self.assertEquals(t_before, t_after)
self.assertEquals(len(conn.mockGetNamedCalls('addPacket')), 0) self.assertEquals(len(conn.mockGetNamedCalls('_addPacket')), 0)
self.assertTrue(oid in self.app.store_lock_dict) self.assertTrue(oid in self.app.store_lock_dict)
def test_28_handleAskStoreObject3(self): def test_28_handleAskStoreObject3(self):
......
neo/storage/tests/testStorageVerificationHandler.py
View file @ 22f00fe1
...@@ -154,7 +154,7 @@ server: 127.0.0.1:10020 ...@@ -154,7 +154,7 @@ server: 127.0.0.1:10020
"getAddress" : ("127.0.0.1", self.client_port)}) "getAddress" : ("127.0.0.1", self.client_port)})
self.verification.connectionAccepted(conn, None, ("127.0.0.1", self.client_port)) self.verification.connectionAccepted(conn, None, ("127.0.0.1", self.client_port))
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_02_timeoutExpired(self): def test_02_timeoutExpired(self):
# listening connection # listening connection
...@@ -164,7 +164,7 @@ server: 127.0.0.1:10020 ...@@ -164,7 +164,7 @@ server: 127.0.0.1:10020
"isServerConnection" : True}) "isServerConnection" : True})
self.verification.timeoutExpired(conn) self.verification.timeoutExpired(conn)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
# client connection # client connection
uuid = self.getNewUUID() uuid = self.getNewUUID()
...@@ -173,7 +173,7 @@ server: 127.0.0.1:10020 ...@@ -173,7 +173,7 @@ server: 127.0.0.1:10020
"isServerConnection" : False}) "isServerConnection" : False})
self.assertRaises(PrimaryFailure, self.verification.timeoutExpired, conn,) self.assertRaises(PrimaryFailure, self.verification.timeoutExpired, conn,)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_03_connectionClosed(self): def test_03_connectionClosed(self):
# listening connection # listening connection
...@@ -183,7 +183,7 @@ server: 127.0.0.1:10020 ...@@ -183,7 +183,7 @@ server: 127.0.0.1:10020
"isServerConnection" : True}) "isServerConnection" : True})
self.verification.connectionClosed(conn) self.verification.connectionClosed(conn)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
# client connection # client connection
uuid = self.getNewUUID() uuid = self.getNewUUID()
...@@ -192,7 +192,7 @@ server: 127.0.0.1:10020 ...@@ -192,7 +192,7 @@ server: 127.0.0.1:10020
"isServerConnection" : False}) "isServerConnection" : False})
self.assertRaises(PrimaryFailure, self.verification.connectionClosed, conn,) self.assertRaises(PrimaryFailure, self.verification.connectionClosed, conn,)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_04_peerBroken(self): def test_04_peerBroken(self):
...@@ -203,7 +203,7 @@ server: 127.0.0.1:10020 ...@@ -203,7 +203,7 @@ server: 127.0.0.1:10020
"isServerConnection" : True}) "isServerConnection" : True})
self.verification.peerBroken(conn) self.verification.peerBroken(conn)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
# client connection # client connection
uuid = self.getNewUUID() uuid = self.getNewUUID()
...@@ -212,7 +212,7 @@ server: 127.0.0.1:10020 ...@@ -212,7 +212,7 @@ server: 127.0.0.1:10020
"isServerConnection" : False}) "isServerConnection" : False})
self.assertRaises(PrimaryFailure, self.verification.peerBroken, conn,) self.assertRaises(PrimaryFailure, self.verification.peerBroken, conn,)
# nothing happens # nothing happens
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
def test_05_handleRequestNodeIdentification(self): def test_05_handleRequestNodeIdentification(self):
......
neo/tests/testConnection.py
View file @ 22f00fe1
...@@ -445,7 +445,7 @@ class testConnection(unittest.TestCase): ...@@ -445,7 +445,7 @@ class testConnection(unittest.TestCase):
# self.assertNotEqual(bc.getConnector(), None) # self.assertNotEqual(bc.getConnector(), None)
# import pdb # import pdb
# pdb.set_trace() # pdb.set_trace()
# bc.addPacket(p) # bc._addPacket(p)
# self.assertNotEqual(bc.write_buf, "testdata") # self.assertNotEqual(bc.write_buf, "testdata")
# self.assertRaises(ProtocolError, p.encode) # self.assertRaises(ProtocolError, p.encode)
# self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 2) # self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 2)
......
neo/tests/testEvent.py
View file @ 22f00fe1
...@@ -148,7 +148,7 @@ class testEvent(unittest.TestCase): ...@@ -148,7 +148,7 @@ class testEvent(unittest.TestCase):
self.assertEquals(len(conn.mockGetNamedCalls("close")), 0) self.assertEquals(len(conn.mockGetNamedCalls("close")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 0) self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0) self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0)
# call with time < t < critical_time # call with time < t < critical_time
...@@ -204,7 +204,7 @@ class testEvent(unittest.TestCase): ...@@ -204,7 +204,7 @@ class testEvent(unittest.TestCase):
self.assertEquals(len(conn.mockGetNamedCalls("close")), 0) self.assertEquals(len(conn.mockGetNamedCalls("close")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 0) self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0) self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0)
# call with time < t < critical_time # call with time < t < critical_time
...@@ -217,7 +217,7 @@ class testEvent(unittest.TestCase): ...@@ -217,7 +217,7 @@ class testEvent(unittest.TestCase):
self.assertEquals(len(conn.mockGetNamedCalls("close")), 0) self.assertEquals(len(conn.mockGetNamedCalls("close")), 0)
self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 1) self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0) self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 0)
# call with time < critical_time < t # call with time < critical_time < t
...@@ -230,7 +230,7 @@ class testEvent(unittest.TestCase): ...@@ -230,7 +230,7 @@ class testEvent(unittest.TestCase):
self.assertEquals(len(conn.mockGetNamedCalls("close")), 1) self.assertEquals(len(conn.mockGetNamedCalls("close")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 2) self.assertEquals(len(conn.mockGetNamedCalls("unlock")), 2)
self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1) self.assertEquals(len(conn.mockGetNamedCalls("expectMessage")), 1)
self.assertEquals(len(conn.mockGetNamedCalls("addPacket")), 0) self.assertEquals(len(conn.mockGetNamedCalls("_addPacket")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 1) self.assertEquals(len(handler.mockGetNamedCalls("timeoutExpired")), 1)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7