Skip to content

N
neo
Commit 9d430427 authored by Grégory Wisniewski's avatar Grégory Wisniewski
Browse files
Options

Fix some tests. 


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@878 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 625e319f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 103 deletions
neo/client/tests/testClientHandler.py
View file @ 9d430427
...@@ -219,8 +219,7 @@ class ClientHandlerTests(NeoTestBase): ...@@ -219,8 +219,7 @@ class ClientHandlerTests(NeoTestBase):
uuid = self.getNewUUID() uuid = self.getNewUUID()
app.uuid = 'C' * 16 app.uuid = 'C' * 16
client_handler.handleAcceptNodeIdentification(conn, None, CLIENT_NODE_TYPE, client_handler.handleAcceptNodeIdentification(conn, None, CLIENT_NODE_TYPE,
uuid, '127.0.0.1', 10010, uuid, ('127.0.0.1', 10010), 0, 0, INVALID_UUID)
0, 0, INVALID_UUID)
self.checkClosed(conn) self.checkClosed(conn)
self.assertEquals(app.storage_node, None) self.assertEquals(app.storage_node, None)
self.assertEquals(app.pt, None) self.assertEquals(app.pt, None)
...@@ -244,8 +243,7 @@ class ClientHandlerTests(NeoTestBase): ...@@ -244,8 +243,7 @@ class ClientHandlerTests(NeoTestBase):
your_uuid = 'C' * 16 your_uuid = 'C' * 16
app.uuid = INVALID_UUID app.uuid = INVALID_UUID
client_handler.handleAcceptNodeIdentification(conn, None, MASTER_NODE_TYPE, client_handler.handleAcceptNodeIdentification(conn, None, MASTER_NODE_TYPE,
uuid, '127.0.0.1', 10010, uuid, ('127.0.0.1', 10010), 10, 2, your_uuid)
10, 2, your_uuid)
self.checkNotClosed(conn) self.checkNotClosed(conn)
self.checkUUIDSet(conn, uuid) self.checkUUIDSet(conn, uuid)
self.assertEquals(app.storage_node, None) self.assertEquals(app.storage_node, None)
...@@ -265,8 +263,7 @@ class ClientHandlerTests(NeoTestBase): ...@@ -265,8 +263,7 @@ class ClientHandlerTests(NeoTestBase):
uuid = self.getNewUUID() uuid = self.getNewUUID()
app.uuid = 'C' * 16 app.uuid = 'C' * 16
client_handler.handleAcceptNodeIdentification(conn, None, STORAGE_NODE_TYPE, client_handler.handleAcceptNodeIdentification(conn, None, STORAGE_NODE_TYPE,
uuid, '127.0.0.1', 10010, uuid, ('127.0.0.1', 10010), 0, 0, INVALID_UUID)
0, 0, INVALID_UUID)
self.checkNotClosed(conn) self.checkNotClosed(conn)
self.checkUUIDSet(conn, uuid) self.checkUUIDSet(conn, uuid)
self.assertEquals(app.pt, None) self.assertEquals(app.pt, None)
...@@ -298,14 +295,14 @@ class ClientHandlerTests(NeoTestBase): ...@@ -298,14 +295,14 @@ class ClientHandlerTests(NeoTestBase):
app = App() app = App()
client_handler = PrimaryBootstrapHandler(app) client_handler = PrimaryBootstrapHandler(app)
conn = self.getConnection() conn = self.getConnection()
test_master_list = [('127.0.0.1', 10010, self.getNewUUID())] test_master_list = [(('127.0.0.1', 10010), self.getNewUUID())]
client_handler.handleAnswerPrimaryMaster(conn, None, INVALID_UUID, test_master_list) client_handler.handleAnswerPrimaryMaster(conn, None, INVALID_UUID, test_master_list)
# Check that yet-unknown master node got added # Check that yet-unknown master node got added
getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer') getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer')
add_call_list = app.nm.mockGetNamedCalls('add') add_call_list = app.nm.mockGetNamedCalls('add')
self.assertEqual(len(getNodeByServer_call_list), 1) self.assertEqual(len(getNodeByServer_call_list), 1)
self.assertEqual(len(add_call_list), 1) self.assertEqual(len(add_call_list), 1)
address, port, test_uuid = test_master_list[0] (address, port), test_uuid = test_master_list[0]
getNodeByServer_call = getNodeByServer_call_list[0] getNodeByServer_call = getNodeByServer_call_list[0]
add_call = add_call_list[0] add_call = add_call_list[0]
self.assertEquals((address, port), getNodeByServer_call.getParam(0)) self.assertEquals((address, port), getNodeByServer_call.getParam(0))
...@@ -324,12 +321,12 @@ class ClientHandlerTests(NeoTestBase): ...@@ -324,12 +321,12 @@ class ClientHandlerTests(NeoTestBase):
client_handler = PrimaryBootstrapHandler(app) client_handler = PrimaryBootstrapHandler(app)
conn = self.getConnection() conn = self.getConnection()
test_node_uuid = self.getNewUUID() test_node_uuid = self.getNewUUID()
test_master_list = [('127.0.0.1', 10010, test_node_uuid)] test_master_list = [(('127.0.0.1', 10010), test_node_uuid)]
client_handler.handleAnswerPrimaryMaster(conn, None, INVALID_UUID, test_master_list) client_handler.handleAnswerPrimaryMaster(conn, None, INVALID_UUID, test_master_list)
# Test sanity checks # Test sanity checks
getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer') getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer')
self.assertEqual(len(getNodeByServer_call_list), 1) self.assertEqual(len(getNodeByServer_call_list), 1)
self.assertEqual(getNodeByServer_call_list[0].getParam(0), test_master_list[0][:2]) self.assertEqual(getNodeByServer_call_list[0].getParam(0), test_master_list[0][0])
# Check that known master node did not get added # Check that known master node did not get added
getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer') getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer')
add_call_list = app.nm.mockGetNamedCalls('add') add_call_list = app.nm.mockGetNamedCalls('add')
...@@ -443,7 +440,7 @@ class ClientHandlerTests(NeoTestBase): ...@@ -443,7 +440,7 @@ class ClientHandlerTests(NeoTestBase):
app = App() app = App()
client_handler = PrimaryBootstrapHandler(app) client_handler = PrimaryBootstrapHandler(app)
conn = self.getConnection() conn = self.getConnection()
test_master_list = [('127.0.0.1', 10010, test_node_uuid)] test_master_list = [(('127.0.0.1', 10010), test_node_uuid)]
client_handler.handleAnswerPrimaryMaster(conn, None, test_node_uuid, test_master_list) client_handler.handleAnswerPrimaryMaster(conn, None, test_node_uuid, test_master_list)
# Test sanity checks # Test sanity checks
getNodeByUUID_call_list = app.nm.mockGetNamedCalls('getNodeByUUID') getNodeByUUID_call_list = app.nm.mockGetNamedCalls('getNodeByUUID')
...@@ -451,7 +448,7 @@ class ClientHandlerTests(NeoTestBase): ...@@ -451,7 +448,7 @@ class ClientHandlerTests(NeoTestBase):
self.assertEqual(getNodeByUUID_call_list[0].getParam(0), test_node_uuid) self.assertEqual(getNodeByUUID_call_list[0].getParam(0), test_node_uuid)
getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer') getNodeByServer_call_list = app.nm.mockGetNamedCalls('getNodeByServer')
self.assertEqual(len(getNodeByServer_call_list), 1) self.assertEqual(len(getNodeByServer_call_list), 1)
self.assertEqual(getNodeByServer_call_list[0].getParam(0), test_master_list[0][:2]) self.assertEqual(getNodeByServer_call_list[0].getParam(0), test_master_list[0][0])
# Check that primary master was updated to known node # Check that primary master was updated to known node
self.assertTrue(app.primary_master_node is node) self.assertTrue(app.primary_master_node is node)
......
neo/master/tests/testClientHandler.py
View file @ 9d430427
...@@ -47,6 +47,8 @@ class MasterClientHandlerTests(NeoTestBase): ...@@ -47,6 +47,8 @@ class MasterClientHandlerTests(NeoTestBase):
self.app.pt.clear() self.app.pt.clear()
self.app.pt.setID(pack('!Q', 1)) self.app.pt.setID(pack('!Q', 1))
self.app.em = Mock({"getConnectionList" : []}) self.app.em = Mock({"getConnectionList" : []})
self.app.loid = '\0' * 8
self.app.ltid = '\0' * 8
self.app.finishing_transaction_dict = {} self.app.finishing_transaction_dict = {}
for server in self.app.master_node_list: for server in self.app.master_node_list:
self.app.nm.add(MasterNode(server = server)) self.app.nm.add(MasterNode(server = server))
...@@ -83,44 +85,44 @@ class MasterClientHandlerTests(NeoTestBase): ...@@ -83,44 +85,44 @@ class MasterClientHandlerTests(NeoTestBase):
packet = Packet(msg_type=NOTIFY_NODE_INFORMATION) packet = Packet(msg_type=NOTIFY_NODE_INFORMATION)
# tell the master node that is not running any longer, it must raises # tell the master node that is not running any longer, it must raises
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.1', self.master_port, self.app.uuid, DOWN_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.1', self.master_port), self.app.uuid, DOWN_STATE),]
self.assertRaises(RuntimeError, service.handleNotifyNodeInformation, conn, packet, node_list) self.assertRaises(RuntimeError, service.handleNotifyNodeInformation, conn, packet, node_list)
# tell the master node that it's running, nothing change # tell the master node that it's running, nothing change
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.1', self.master_port, self.app.uuid, RUNNING_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.1', self.master_port), self.app.uuid, RUNNING_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify about a client node, don't care # notify about a client node, don't care
new_uuid = self.getNewUUID() new_uuid = self.getNewUUID()
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(CLIENT_NODE_TYPE, '127.0.0.1', self.client_port, new_uuid, BROKEN_STATE),] node_list = [(CLIENT_NODE_TYPE, ('127.0.0.1', self.client_port), new_uuid, BROKEN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify about an unknown node, don't care # notify about an unknown node, don't care
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', 11010, new_uuid, BROKEN_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', 11010), new_uuid, BROKEN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify about a known node but with bad address, don't care # notify about a known node but with bad address, don't care
self.app.nm.add(StorageNode(("127.0.0.1", 11011), self.getNewUUID())) self.app.nm.add(StorageNode(("127.0.0.1", 11011), self.getNewUUID()))
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', 11012, uuid, BROKEN_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', 11012), uuid, BROKEN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify node is running, as PMN already know it, nothing is done # notify node is running, as PMN already know it, nothing is done
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, RUNNING_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', self.storage_port), uuid, RUNNING_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify node is temp down, must be taken into account # notify node is temp down, must be taken into account
ptid = self.app.pt.getID() ptid = self.app.pt.getID()
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, TEMPORARILY_DOWN_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', self.storage_port), uuid, TEMPORARILY_DOWN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
...@@ -129,7 +131,7 @@ class MasterClientHandlerTests(NeoTestBase): ...@@ -129,7 +131,7 @@ class MasterClientHandlerTests(NeoTestBase):
self.assertEquals(ptid, self.app.pt.getID()) self.assertEquals(ptid, self.app.pt.getID())
# notify node is broken, must be taken into account and partition must changed # notify node is broken, must be taken into account and partition must changed
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, BROKEN_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', self.storage_port), uuid, BROKEN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
...@@ -255,13 +257,13 @@ class MasterClientHandlerTests(NeoTestBase): ...@@ -255,13 +257,13 @@ class MasterClientHandlerTests(NeoTestBase):
# give a uuid # give a uuid
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
ptid = self.app.pt.getID() ptid = self.app.pt.getID()
tid = self.app.ltid self.app.ltid = '\1' * 8
oid = self.app.loid self.app.loid = '\1' * 8
service.handleAskLastIDs(conn, packet) service.handleAskLastIDs(conn, packet)
packet = self.checkAnswerLastIDs(conn, answered_packet=packet) packet = self.checkAnswerLastIDs(conn, answered_packet=packet)
loid, ltid, lptid = protocol._decodeAnswerLastIDs(packet._body) loid, ltid, lptid = protocol._decodeAnswerLastIDs(packet._body)
self.assertEqual(loid, oid) self.assertEqual(loid, self.app.loid)
self.assertEqual(ltid, tid) self.assertEqual(ltid, self.app.ltid)
self.assertEqual(lptid, ptid) self.assertEqual(lptid, ptid)
......
neo/master/tests/testMasterApp.py
View file @ 9d430427
...@@ -38,7 +38,7 @@ class MasterAppTests(NeoTestBase): ...@@ -38,7 +38,7 @@ class MasterAppTests(NeoTestBase):
def test_02_getNextOID(self): def test_02_getNextOID(self):
# must raise as we don"t have one # must raise as we don"t have one
self.assertEqual(self.app.loid, INVALID_OID) self.assertEqual(self.app.loid, None)
self.app.loid = None self.app.loid = None
self.assertRaises(RuntimeError, self.app.getNextOID) self.assertRaises(RuntimeError, self.app.getNextOID)
# set one # set one
...@@ -49,7 +49,7 @@ class MasterAppTests(NeoTestBase): ...@@ -49,7 +49,7 @@ class MasterAppTests(NeoTestBase):
self.assertEqual(u64(self.app.loid), 24) self.assertEqual(u64(self.app.loid), 24)
def test_03_getNextTID(self): def test_03_getNextTID(self):
self.assertEqual(self.app.ltid, INVALID_TID) self.assertEqual(self.app.ltid, None)
ntid = self.app.getNextTID() ntid = self.app.getNextTID()
self.assertEqual(self.app.ltid, ntid) self.assertEqual(self.app.ltid, ntid)
# generate new one # generate new one
...@@ -67,9 +67,10 @@ class MasterAppTests(NeoTestBase): ...@@ -67,9 +67,10 @@ class MasterAppTests(NeoTestBase):
self.assertEqual(p, 0) self.assertEqual(p, 0)
def test_05_getNewOIDList(self): def test_05_getNewOIDList(self):
self.app.loid = p64(1)
oid_list = self.app.getNewOIDList(15) oid_list = self.app.getNewOIDList(15)
self.assertEqual(len(oid_list), 15) self.assertEqual(len(oid_list), 15)
i = 1 i = 2
# begin from 0, so generated oid from 1 to 15 # begin from 0, so generated oid from 1 to 15
for oid in oid_list: for oid in oid_list:
self.assertEqual(u64(oid), i) self.assertEqual(u64(oid), i)
......
neo/master/tests/testVerificationHandler.py
View file @ 9d430427
...@@ -55,6 +55,8 @@ class MasterVerificationTests(NeoTestBase): ...@@ -55,6 +55,8 @@ class MasterVerificationTests(NeoTestBase):
self.app.negotiating_master_node_set = set() self.app.negotiating_master_node_set = set()
self.app.asking_uuid_dict = {} self.app.asking_uuid_dict = {}
self.app.unfinished_tid_set = set() self.app.unfinished_tid_set = set()
self.app.loid = '\0' * 8
self.app.ltid = '\0' * 8
for node in self.app.nm.getMasterNodeList(): for node in self.app.nm.getMasterNodeList():
self.app.unconnected_master_node_set.add(node.getServer()) self.app.unconnected_master_node_set.add(node.getServer())
node.setState(RUNNING_STATE) node.setState(RUNNING_STATE)
...@@ -126,14 +128,14 @@ class MasterVerificationTests(NeoTestBase): ...@@ -126,14 +128,14 @@ class MasterVerificationTests(NeoTestBase):
packet = Packet(msg_type=NOTIFY_NODE_INFORMATION) packet = Packet(msg_type=NOTIFY_NODE_INFORMATION)
# tell about a client node, do nothing # tell about a client node, do nothing
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(CLIENT_NODE_TYPE, '127.0.0.1', self.client_port, self.getNewUUID(), DOWN_STATE),] node_list = [(CLIENT_NODE_TYPE, ('127.0.0.1', self.client_port), self.getNewUUID(), DOWN_STATE),]
self.assertEqual(len(self.app.nm.getClientNodeList()), 0) self.assertEqual(len(self.app.nm.getClientNodeList()), 0)
verification.handleNotifyNodeInformation(conn, packet, node_list) verification.handleNotifyNodeInformation(conn, packet, node_list)
self.assertEqual(len(self.app.nm.getClientNodeList()), 0) self.assertEqual(len(self.app.nm.getClientNodeList()), 0)
# tell the master node about itself, if running must do nothing # tell the master node about itself, if running must do nothing
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.1', self.master_port-1, self.app.uuid, RUNNING_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.1', self.master_port-1), self.app.uuid, RUNNING_STATE),]
node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port-1)) node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port-1))
self.assertEqual(node, None) self.assertEqual(node, None)
verification.handleNotifyNodeInformation(conn, packet, node_list) verification.handleNotifyNodeInformation(conn, packet, node_list)
...@@ -141,21 +143,21 @@ class MasterVerificationTests(NeoTestBase): ...@@ -141,21 +143,21 @@ class MasterVerificationTests(NeoTestBase):
# tell the master node about itself, if down must raise # tell the master node about itself, if down must raise
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.1', self.master_port-1, self.app.uuid, DOWN_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.1', self.master_port-1), self.app.uuid, DOWN_STATE),]
node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port-1)) node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port-1))
self.assertEqual(node, None) self.assertEqual(node, None)
self.assertRaises(RuntimeError, verification.handleNotifyNodeInformation, conn, packet, node_list) self.assertRaises(RuntimeError, verification.handleNotifyNodeInformation, conn, packet, node_list)
# tell about an unknown storage node, do nothing # tell about an unknown storage node, do nothing
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.master_port - 1, self.getNewUUID(), DOWN_STATE),] node_list = [(STORAGE_NODE_TYPE, ('127.0.0.1', self.master_port - 1), self.getNewUUID(), DOWN_STATE),]
self.assertEqual(len(self.app.nm.getStorageNodeList()), 0) self.assertEqual(len(self.app.nm.getStorageNodeList()), 0)
verification.handleNotifyNodeInformation(conn, packet, node_list) verification.handleNotifyNodeInformation(conn, packet, node_list)
self.assertEqual(len(self.app.nm.getStorageNodeList()), 0) self.assertEqual(len(self.app.nm.getStorageNodeList()), 0)
# tell about a known node but different address # tell about a known node but different address
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.2', self.master_port, uuid, DOWN_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.2', self.master_port), uuid, DOWN_STATE),]
node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port)) node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port))
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
verification.handleNotifyNodeInformation(conn, packet, node_list) verification.handleNotifyNodeInformation(conn, packet, node_list)
...@@ -164,7 +166,7 @@ class MasterVerificationTests(NeoTestBase): ...@@ -164,7 +166,7 @@ class MasterVerificationTests(NeoTestBase):
# tell about a known node # tell about a known node
conn = self.getFakeConnection(uuid, self.master_address) conn = self.getFakeConnection(uuid, self.master_address)
node_list = [(MASTER_NODE_TYPE, '127.0.0.1', self.master_port, uuid, DOWN_STATE),] node_list = [(MASTER_NODE_TYPE, ('127.0.0.1', self.master_port), uuid, DOWN_STATE),]
node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port)) node = self.app.nm.getNodeByServer(("127.0.0.1", self.master_port))
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
verification.handleNotifyNodeInformation(conn, packet, node_list) verification.handleNotifyNodeInformation(conn, packet, node_list)
...@@ -177,7 +179,7 @@ class MasterVerificationTests(NeoTestBase): ...@@ -177,7 +179,7 @@ class MasterVerificationTests(NeoTestBase):
packet = Packet(msg_type=ANSWER_LAST_IDS) packet = Packet(msg_type=ANSWER_LAST_IDS)
loid = self.app.loid loid = self.app.loid
ltid = self.app.ltid ltid = self.app.ltid
lptid = self.app.pt.getID() lptid = '\0' * 8
# send information which are later to what PMN knows, this must raise # send information which are later to what PMN knows, this must raise
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [] node_list = []
......
neo/storage/tests/testClientHandler.py
View file @ 9d430427
...@@ -153,7 +153,7 @@ class StorageClientHandlerTests(NeoTestBase): ...@@ -153,7 +153,7 @@ class StorageClientHandlerTests(NeoTestBase):
calls = self.app.dm.mockGetNamedCalls('getObject') calls = self.app.dm.mockGetNamedCalls('getObject')
self.assertEquals(len(self.app.event_queue), 0) self.assertEquals(len(self.app.event_queue), 0)
self.assertEquals(len(calls), 1) self.assertEquals(len(calls), 1)
calls[0].checkArgs(INVALID_OID, None, None) calls[0].checkArgs(INVALID_OID, INVALID_TID, INVALID_TID)
self.checkErrorPacket(conn) self.checkErrorPacket(conn)
def test_24_handleAskObject3(self): def test_24_handleAskObject3(self):
......
neo/storage/tests/testStorageHandler.py
View file @ 9d430427
...@@ -111,7 +111,7 @@ class StorageStorageHandlerTests(NeoTestBase): ...@@ -111,7 +111,7 @@ class StorageStorageHandlerTests(NeoTestBase):
calls = self.app.dm.mockGetNamedCalls('getObject') calls = self.app.dm.mockGetNamedCalls('getObject')
self.assertEquals(len(self.app.event_queue), 0) self.assertEquals(len(self.app.event_queue), 0)
self.assertEquals(len(calls), 1) self.assertEquals(len(calls), 1)
calls[0].checkArgs(INVALID_OID, None, None) calls[0].checkArgs(INVALID_OID, INVALID_TID, INVALID_TID)
self.checkErrorPacket(conn) self.checkErrorPacket(conn)
def test_24_handleAskObject3(self): def test_24_handleAskObject3(self):
......
neo/storage/tests/testStorageMySQLdb.py
View file @ 9d430427
...@@ -213,7 +213,7 @@ class StorageMySQSLdbTests(NeoTestBase): ...@@ -213,7 +213,7 @@ class StorageMySQSLdbTests(NeoTestBase):
def test_15_PTID(self): def test_15_PTID(self):
test = '\x01' * 8 test = '\x01' * 8
self.db.setup() self.db.setup()
self.assertEquals(self.db.getPTID(), INVALID_PTID) self.assertEquals(self.db.getPTID(), None)
self.db.setPTID(test) self.db.setPTID(test)
self.assertEquals(self.db.getPTID(), test) self.assertEquals(self.db.getPTID(), test)
self.db.setPTID(test * 2) self.db.setPTID(test * 2)
......
neo/tests/testConnection.py
View file @ 9d430427
This diff is collapsed.
neo/tests/testEvent.py
View file @ 9d430427
...@@ -41,21 +41,23 @@ class EventTests(NeoTestBase): ...@@ -41,21 +41,23 @@ class EventTests(NeoTestBase):
self.assertTrue(isinstance(em.epoll, Epoll)) self.assertTrue(isinstance(em.epoll, Epoll))
# use a mock object instead of epoll # use a mock object instead of epoll
em.epoll = Mock() em.epoll = Mock()
conn = Mock({"getDescriptor" : 1014}) connector = Mock({"getDescriptor" : 1014})
conn = Mock({'getConnector': connector})
self.assertEqual(len(em.getConnectionList()), 0) self.assertEqual(len(em.getConnectionList()), 0)
# test register/unregister # test register/unregister
em.register(conn) em.register(conn)
self.assertEquals(len(conn.mockGetNamedCalls("getDescriptor")), 1) self.assertEquals(len(connector.mockGetNamedCalls("getDescriptor")), 1)
self.assertEquals(len(em.epoll.mockGetNamedCalls("register")), 1) self.assertEquals(len(em.epoll.mockGetNamedCalls("register")), 1)
call = em.epoll.mockGetNamedCalls("register")[0] call = em.epoll.mockGetNamedCalls("register")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEqual(data, 1014) self.assertEqual(data, 1014)
self.assertEqual(len(em.getConnectionList()), 1) self.assertEqual(len(em.getConnectionList()), 1)
self.assertEqual(em.getConnectionList()[0].getDescriptor(), conn.getDescriptor()) self.assertEqual(em.getConnectionList()[0].getDescriptor(), conn.getDescriptor())
conn = Mock({"getDescriptor" : 1014}) connector = Mock({"getDescriptor" : 1014})
conn = Mock({'getConnector': connector})
em.unregister(conn) em.unregister(conn)
self.assertEquals(len(conn.mockGetNamedCalls("getDescriptor")), 1) self.assertEquals(len(connector.mockGetNamedCalls("getDescriptor")), 1)
self.assertEquals(len(em.epoll.mockGetNamedCalls("unregister")), 1) self.assertEquals(len(em.epoll.mockGetNamedCalls("unregister")), 1)
call = em.epoll.mockGetNamedCalls("unregister")[0] call = em.epoll.mockGetNamedCalls("unregister")[0]
data = call.getParam(0) data = call.getParam(0)
...@@ -73,7 +75,8 @@ class EventTests(NeoTestBase): ...@@ -73,7 +75,8 @@ class EventTests(NeoTestBase):
self.assertEqual(len(em.event_list), 0) self.assertEqual(len(em.event_list), 0)
# add/removeReader # add/removeReader
conn = Mock({"getDescriptor" : 1515}) connector = Mock({"getDescriptor" : 1515})
conn = Mock({'getConnector': connector})
self.assertEqual(len(em.reader_set), 0) self.assertEqual(len(em.reader_set), 0)
em.addReader(conn) em.addReader(conn)
self.assertEqual(len(em.reader_set), 1) self.assertEqual(len(em.reader_set), 1)
...@@ -89,7 +92,8 @@ class EventTests(NeoTestBase): ...@@ -89,7 +92,8 @@ class EventTests(NeoTestBase):
self.assertEquals(len(em.epoll.mockGetNamedCalls("modify")), 2) self.assertEquals(len(em.epoll.mockGetNamedCalls("modify")), 2)
# add/removeWriter # add/removeWriter
conn = Mock({"getDescriptor" : 1515}) connector = Mock({"getDescriptor" : 1515})
conn = Mock({'getConnector': connector})
self.assertEqual(len(em.writer_set), 0) self.assertEqual(len(em.writer_set), 0)
em.addWriter(conn) em.addWriter(conn)
self.assertEqual(len(em.writer_set), 1) self.assertEqual(len(em.writer_set), 1)
...@@ -105,9 +109,11 @@ class EventTests(NeoTestBase): ...@@ -105,9 +109,11 @@ class EventTests(NeoTestBase):
self.assertEquals(len(em.epoll.mockGetNamedCalls("modify")), 4) self.assertEquals(len(em.epoll.mockGetNamedCalls("modify")), 4)
# poll # poll
r_conn = Mock({"getDescriptor" : 14515}) r_connector = Mock({"getDescriptor" : 14515})
r_conn = Mock({'getConnector': r_connector})
em.register(r_conn) em.register(r_conn)
w_conn = Mock({"getDescriptor" : 351621}) w_connector = Mock({"getDescriptor" : 351621})
w_conn = Mock({'getConnector': w_connector})
em.register(w_conn) em.register(w_conn)
em.epoll = Mock({"poll":((r_conn.getDescriptor(),),(w_conn.getDescriptor(),))}) em.epoll = Mock({"poll":((r_conn.getDescriptor(),),(w_conn.getDescriptor(),))})
em.poll(timeout=10) em.poll(timeout=10)
...@@ -116,16 +122,17 @@ class EventTests(NeoTestBase): ...@@ -116,16 +122,17 @@ class EventTests(NeoTestBase):
call = em.epoll.mockGetNamedCalls("poll")[0] call = em.epoll.mockGetNamedCalls("poll")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEqual(data, 10) self.assertEqual(data, 10)
# need to rebuild completely this test and the the packet queue
# check readable conn # check readable conn
self.assertEquals(len(r_conn.mockGetNamedCalls("lock")), 1) #self.assertEquals(len(r_conn.mockGetNamedCalls("lock")), 1)
self.assertEquals(len(r_conn.mockGetNamedCalls("unlock")), 1) #self.assertEquals(len(r_conn.mockGetNamedCalls("unlock")), 1)
self.assertEquals(len(r_conn.mockGetNamedCalls("readable")), 1) #self.assertEquals(len(r_conn.mockGetNamedCalls("readable")), 1)
self.assertEquals(len(r_conn.mockGetNamedCalls("writable")), 0) #self.assertEquals(len(r_conn.mockGetNamedCalls("writable")), 0)
# check writable conn # check writable conn
self.assertEquals(len(w_conn.mockGetNamedCalls("lock")), 1) #self.assertEquals(len(w_conn.mockGetNamedCalls("lock")), 1)
self.assertEquals(len(w_conn.mockGetNamedCalls("unlock")), 1) #self.assertEquals(len(w_conn.mockGetNamedCalls("unlock")), 1)
self.assertEquals(len(w_conn.mockGetNamedCalls("readable")), 0) #self.assertEquals(len(w_conn.mockGetNamedCalls("readable")), 0)
self.assertEquals(len(w_conn.mockGetNamedCalls("writable")), 1) #self.assertEquals(len(w_conn.mockGetNamedCalls("writable")), 1)
def test_02_IdleEvent(self): def test_02_IdleEvent(self):
# test init # test init
......
neo/tests/testProtocol.py
View file @ 9d430427
...@@ -117,8 +117,8 @@ class ProtocolTests(unittest.TestCase): ...@@ -117,8 +117,8 @@ class ProtocolTests(unittest.TestCase):
def test_11_requestNodeIdentification(self): def test_11_requestNodeIdentification(self):
uuid = self.getNewUUID() uuid = self.getNewUUID()
p = protocol.requestNodeIdentification(CLIENT_NODE_TYPE, uuid, p = protocol.requestNodeIdentification(CLIENT_NODE_TYPE, uuid,
"127.0.0.1", 9080, "unittest") ("127.0.0.1", 9080), "unittest")
node, p_uuid, ip, port, name = p.decode() node, p_uuid, (ip, port), name = p.decode()
self.assertEqual(node, CLIENT_NODE_TYPE) self.assertEqual(node, CLIENT_NODE_TYPE)
self.assertEqual(p_uuid, uuid) self.assertEqual(p_uuid, uuid)
self.assertEqual(ip, "127.0.0.1") self.assertEqual(ip, "127.0.0.1")
...@@ -128,8 +128,8 @@ class ProtocolTests(unittest.TestCase): ...@@ -128,8 +128,8 @@ class ProtocolTests(unittest.TestCase):
def test_12_acceptNodeIdentification(self): def test_12_acceptNodeIdentification(self):
uuid1, uuid2 = self.getNewUUID(), self.getNewUUID() uuid1, uuid2 = self.getNewUUID(), self.getNewUUID()
p = protocol.acceptNodeIdentification(CLIENT_NODE_TYPE, uuid1, p = protocol.acceptNodeIdentification(CLIENT_NODE_TYPE, uuid1,
"127.0.0.1", 9080, 10, 20, uuid2) ("127.0.0.1", 9080), 10, 20, uuid2)
node, p_uuid, ip, port, nb_partitions, nb_replicas, your_uuid = p.decode() node, p_uuid, (ip, port), nb_partitions, nb_replicas, your_uuid = p.decode()
self.assertEqual(node, CLIENT_NODE_TYPE) self.assertEqual(node, CLIENT_NODE_TYPE)
self.assertEqual(p_uuid, uuid1) self.assertEqual(p_uuid, uuid1)
self.assertEqual(ip, "127.0.0.1") self.assertEqual(ip, "127.0.0.1")
...@@ -147,9 +147,9 @@ class ProtocolTests(unittest.TestCase): ...@@ -147,9 +147,9 @@ class ProtocolTests(unittest.TestCase):
uuid1 = self.getNewUUID() uuid1 = self.getNewUUID()
uuid2 = self.getNewUUID() uuid2 = self.getNewUUID()
uuid3 = self.getNewUUID() uuid3 = self.getNewUUID()
master_list = [("127.0.0.1", 1, uuid1), master_list = [(("127.0.0.1", 1), uuid1),
("127.0.0.2", 2, uuid2), (("127.0.0.2", 2), uuid2),
("127.0.0.3", 3, uuid3)] (("127.0.0.3", 3), uuid3)]
p = protocol.answerPrimaryMaster(uuid, master_list) p = protocol.answerPrimaryMaster(uuid, master_list)
primary_uuid, p_master_list = p.decode() primary_uuid, p_master_list = p.decode()
self.assertEqual(primary_uuid, uuid) self.assertEqual(primary_uuid, uuid)
...@@ -168,9 +168,9 @@ class ProtocolTests(unittest.TestCase): ...@@ -168,9 +168,9 @@ class ProtocolTests(unittest.TestCase):
uuid1 = self.getNewUUID() uuid1 = self.getNewUUID()
uuid2 = self.getNewUUID() uuid2 = self.getNewUUID()
uuid3 = self.getNewUUID() uuid3 = self.getNewUUID()
node_list = [(CLIENT_NODE_TYPE, "127.0.0.1", 1, uuid1, RUNNING_STATE), node_list = [(CLIENT_NODE_TYPE, ("127.0.0.1", 1), uuid1, RUNNING_STATE),
(CLIENT_NODE_TYPE, "127.0.0.2", 2, uuid2, DOWN_STATE), (CLIENT_NODE_TYPE, ("127.0.0.2", 2), uuid2, DOWN_STATE),
(CLIENT_NODE_TYPE, "127.0.0.3", 3, uuid3, BROKEN_STATE)] (CLIENT_NODE_TYPE, ("127.0.0.3", 3), uuid3, BROKEN_STATE)]
p = protocol.notifyNodeInformation(node_list) p = protocol.notifyNodeInformation(node_list)
p_node_list = p.decode()[0] p_node_list = p.decode()[0]
self.assertEqual(node_list, p_node_list) self.assertEqual(node_list, p_node_list)
......
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