Skip to content

N
neoppod
Commit 8197473f authored by Grégory Wisniewski's avatar Grégory Wisniewski
Browse files
Options

Update tests for master/recovery.py and master/verification.py according to 

commit #416.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@425 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 14e700b4
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 38 deletions
neo/master/tests/testMasterRecoveryHandler.py
View file @ 8197473f
...@@ -367,8 +367,9 @@ server: 127.0.0.1:10023 ...@@ -367,8 +367,9 @@ server: 127.0.0.1:10023
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
known_uuid = uuid
# 5. known by uuid, but different address # 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,
...@@ -387,9 +388,18 @@ server: 127.0.0.1:10023 ...@@ -387,9 +388,18 @@ server: 127.0.0.1:10023
ip_address='127.0.0.2', ip_address='127.0.0.2',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
self.checkCalledAbort(conn) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
self.checkCalledAcceptNodeIdentification(conn)
# a new uuid is sent
call = conn.mockGetNamedCalls('addPacket')[0]
body = call.getParam(0)._body
new_uuid = body[:-16]
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 -> conflict
conn = Mock({"addPacket" : None, conn = Mock({"addPacket" : None,
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
...@@ -402,7 +412,7 @@ server: 127.0.0.1:10023 ...@@ -402,7 +412,7 @@ server: 127.0.0.1:10023
node.setState(DOWN_STATE) node.setState(DOWN_STATE)
self.assertEqual(node.getState(), DOWN_STATE) self.assertEqual(node.getState(), DOWN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
recovery.handleRequestNodeIdentification(conn, recovery.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
...@@ -410,32 +420,27 @@ server: 127.0.0.1:10023 ...@@ -410,32 +420,27 @@ server: 127.0.0.1:10023
ip_address='127.0.0.2', ip_address='127.0.0.2',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
self.checkCalledAbort(conn)
node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn)
# 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,
"getAddress" : ("127.0.0.2", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
node = self.app.nm.getNodeByServer(conn.getAddress()) node = self.app.nm.getNodeByServer(conn.getAddress())
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), DOWN_STATE)
node.setState(BROKEN_STATE) node.setState(BROKEN_STATE)
self.assertEqual(node.getState(), BROKEN_STATE) self.assertEqual(node.getState(), BROKEN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
recovery.handleRequestNodeIdentification(conn, recovery.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
uuid=uuid, uuid=uuid,
ip_address='127.0.0.2', ip_address='127.0.0.1',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
...@@ -446,7 +451,7 @@ server: 127.0.0.1:10023 ...@@ -446,7 +451,7 @@ server: 127.0.0.1:10023
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.2", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
node = self.app.nm.getNodeByServer(conn.getAddress()) node = self.app.nm.getNodeByServer(conn.getAddress())
...@@ -454,17 +459,17 @@ server: 127.0.0.1:10023 ...@@ -454,17 +459,17 @@ server: 127.0.0.1:10023
node.setState(DOWN_STATE) node.setState(DOWN_STATE)
self.assertEqual(node.getState(), DOWN_STATE) self.assertEqual(node.getState(), DOWN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
recovery.handleRequestNodeIdentification(conn, recovery.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
uuid=uuid, uuid=uuid,
ip_address='127.0.0.2', ip_address='127.0.0.1',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
node = self.app.nm.getNodeByUUID(conn.getUUID()) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
...@@ -478,7 +483,7 @@ server: 127.0.0.1:10023 ...@@ -478,7 +483,7 @@ server: 127.0.0.1:10023
"getAddress" : ("127.0.0.3", self.master_port)}) "getAddress" : ("127.0.0.3", self.master_port)})
self.assertEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
recovery.handleRequestNodeIdentification(conn, recovery.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
...@@ -488,7 +493,7 @@ server: 127.0.0.1:10023 ...@@ -488,7 +493,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
node = self.app.nm.getNodeByUUID(conn.getUUID()) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 2) self.assertEqual(len(self.app.nm.getMasterNodeList()), 3)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
......
neo/master/tests/testMasterVerificationHandler.py
View file @ 8197473f
...@@ -409,7 +409,16 @@ server: 127.0.0.1:10023 ...@@ -409,7 +409,16 @@ server: 127.0.0.1:10023
ip_address='127.0.0.2', ip_address='127.0.0.2',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
self.checkCalledAbort(conn) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
self.checkCalledAcceptNodeIdentification(conn)
# a new uuid is sent
call = conn.mockGetNamedCalls('addPacket')[0]
body = call.getParam(0)._body
new_uuid = body[:-16]
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,
...@@ -424,7 +433,7 @@ server: 127.0.0.1:10023 ...@@ -424,7 +433,7 @@ server: 127.0.0.1:10023
node.setState(DOWN_STATE) node.setState(DOWN_STATE)
self.assertEqual(node.getState(), DOWN_STATE) self.assertEqual(node.getState(), DOWN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
verification.handleRequestNodeIdentification(conn, verification.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
...@@ -432,32 +441,27 @@ server: 127.0.0.1:10023 ...@@ -432,32 +441,27 @@ server: 127.0.0.1:10023
ip_address='127.0.0.2', ip_address='127.0.0.2',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
self.checkCalledAbort(conn)
node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn)
# 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,
"getAddress" : ("127.0.0.2", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
node = self.app.nm.getNodeByServer(conn.getAddress()) node = self.app.nm.getNodeByServer(conn.getAddress())
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), DOWN_STATE)
node.setState(BROKEN_STATE) node.setState(BROKEN_STATE)
self.assertEqual(node.getState(), BROKEN_STATE) self.assertEqual(node.getState(), BROKEN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
verification.handleRequestNodeIdentification(conn, verification.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
uuid=uuid, uuid=uuid,
ip_address='127.0.0.2', ip_address='127.0.0.1',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
...@@ -468,7 +472,7 @@ server: 127.0.0.1:10023 ...@@ -468,7 +472,7 @@ server: 127.0.0.1:10023
"abort" : None, "abort" : None,
"expectMessage" : None, "expectMessage" : None,
"getUUID" : uuid, "getUUID" : uuid,
"getAddress" : ("127.0.0.2", self.master_port)}) "getAddress" : ("127.0.0.1", self.master_port)})
self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertNotEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertNotEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
node = self.app.nm.getNodeByServer(conn.getAddress()) node = self.app.nm.getNodeByServer(conn.getAddress())
...@@ -476,17 +480,17 @@ server: 127.0.0.1:10023 ...@@ -476,17 +480,17 @@ server: 127.0.0.1:10023
node.setState(DOWN_STATE) node.setState(DOWN_STATE)
self.assertEqual(node.getState(), DOWN_STATE) self.assertEqual(node.getState(), DOWN_STATE)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
verification.handleRequestNodeIdentification(conn, verification.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
uuid=uuid, uuid=uuid,
ip_address='127.0.0.2', ip_address='127.0.0.1',
port=self.master_port, port=self.master_port,
name=self.app.name,) name=self.app.name,)
node = self.app.nm.getNodeByUUID(conn.getUUID()) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
...@@ -500,7 +504,7 @@ server: 127.0.0.1:10023 ...@@ -500,7 +504,7 @@ server: 127.0.0.1:10023
"getAddress" : ("127.0.0.3", self.master_port)}) "getAddress" : ("127.0.0.3", self.master_port)})
self.assertEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None) self.assertEqual(self.app.nm.getNodeByUUID(conn.getUUID()), None)
self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()), None) self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()), None)
self.assertEqual(len(self.app.nm.getMasterNodeList()), 1) self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
verification.handleRequestNodeIdentification(conn, verification.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=MASTER_NODE_TYPE, node_type=MASTER_NODE_TYPE,
...@@ -510,7 +514,7 @@ server: 127.0.0.1:10023 ...@@ -510,7 +514,7 @@ server: 127.0.0.1:10023
name=self.app.name,) name=self.app.name,)
node = self.app.nm.getNodeByUUID(conn.getUUID()) node = self.app.nm.getNodeByUUID(conn.getUUID())
self.assertEqual(len(self.app.nm.getMasterNodeList()), 2) self.assertEqual(len(self.app.nm.getMasterNodeList()), 3)
self.assertEqual(node.getUUID(), uuid) self.assertEqual(node.getUUID(), uuid)
self.assertEqual(node.getState(), RUNNING_STATE) self.assertEqual(node.getState(), RUNNING_STATE)
self.checkCalledAcceptNodeIdentification(conn) self.checkCalledAcceptNodeIdentification(conn)
......
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