Skip to content

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

Update connection tests according to commit #460 


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@461 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 033baabe
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 76 deletions
neo/tests/testConnection.py
View file @ f5726ab1
...@@ -157,8 +157,8 @@ class testConnection(unittest.TestCase): ...@@ -157,8 +157,8 @@ class testConnection(unittest.TestCase):
self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413)) self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413))
self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0) self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0)
self.assertEqual(bc.getConnector(), None) self.assertEqual(bc.getConnector(), None)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEqual(bc.cur_id, 0) self.assertEqual(bc.cur_id, 0)
self.assertEqual(bc.event_dict, {}) self.assertEqual(bc.event_dict, {})
self.assertEqual(bc.aborted, False) self.assertEqual(bc.aborted, False)
...@@ -190,22 +190,22 @@ class testConnection(unittest.TestCase): ...@@ -190,22 +190,22 @@ class testConnection(unittest.TestCase):
handler = Mock() handler = Mock()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=None, addr=("127.0.0.7", 93413)) connector=None, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEqual(bc.connector, None) self.assertEqual(bc.connector, None)
# no connector and no buffer # no connector and no buffer
self.assertFalse(bc.pending()) self.assertFalse(bc.pending())
# no connector but buffer # no connector but buffer
bc.write_buf.append(1) bc.write_buf += '1'
self.assertFalse(bc.pending()) self.assertFalse(bc.pending())
# connector with no buffer # connector with no buffer
conn = DoNothingConnector() conn = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=conn, addr=("127.0.0.7", 93413)) connector=conn, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertNotEqual(bc.connector, None) self.assertNotEqual(bc.connector, None)
self.assertFalse(bc.pending()) self.assertFalse(bc.pending())
# connector and buffer # connector and buffer
bc.write_buf.append(1) bc.write_buf += '1'
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
...@@ -219,11 +219,11 @@ class testConnection(unittest.TestCase): ...@@ -219,11 +219,11 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.recv() bc.recv()
self.assertEqual(bc.read_buf, ["testdata",]) self.assertEqual(bc.read_buf, "testdata")
# patch receive method to raise try again # patch receive method to raise try again
def receive(self): def receive(self):
...@@ -232,10 +232,10 @@ class testConnection(unittest.TestCase): ...@@ -232,10 +232,10 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.recv() bc.recv()
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
# patch receive method to raise any error # patch receive method to raise any error
...@@ -245,10 +245,10 @@ class testConnection(unittest.TestCase): ...@@ -245,10 +245,10 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.recv() bc.recv()
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 1) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 1)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1)
...@@ -261,7 +261,7 @@ class testConnection(unittest.TestCase): ...@@ -261,7 +261,7 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 0) self.assertEquals(len(connector.mockGetNamedCalls("send")), 0)
...@@ -275,15 +275,15 @@ class testConnection(unittest.TestCase): ...@@ -275,15 +275,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -294,15 +294,15 @@ class testConnection(unittest.TestCase): ...@@ -294,15 +294,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, ["data"]) self.assertEqual(bc.write_buf, "data")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -313,15 +313,15 @@ class testConnection(unittest.TestCase): ...@@ -313,15 +313,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata", "second", "third"] bc.write_buf = "testdata" + "second" + "third"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdatasecondthird") self.assertEquals(data, "testdatasecondthird")
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -332,15 +332,15 @@ class testConnection(unittest.TestCase): ...@@ -332,15 +332,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata", "second", "third"] bc.write_buf = "testdata" + "second" + "third"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdatasecondthird") self.assertEquals(data, "testdatasecondthird")
self.assertEqual(bc.write_buf, ["econdthird"]) self.assertEqual(bc.write_buf, "econdthird")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -351,15 +351,15 @@ class testConnection(unittest.TestCase): ...@@ -351,15 +351,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata", "second", "third"] bc.write_buf = "testdata" + "second" + "third"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdatasecondthird") self.assertEquals(data, "testdatasecondthird")
self.assertEqual(bc.write_buf, ["testdata", "second", "third"]) self.assertEqual(bc.write_buf, "testdata" + "second" + "third")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -370,15 +370,15 @@ class testConnection(unittest.TestCase): ...@@ -370,15 +370,15 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata", "second", "third"] bc.write_buf = "testdata" + "second" + "third"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.send() bc.send()
self.assertEquals(len(connector.mockGetNamedCalls("send")), 1) self.assertEquals(len(connector.mockGetNamedCalls("send")), 1)
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdatasecondthird") self.assertEquals(data, "testdatasecondthird")
self.assertEqual(bc.write_buf, ["testdata", "second", "third"]) self.assertEqual(bc.write_buf, "testdata" + "second" + "third")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 1) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 1)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1)
...@@ -391,19 +391,19 @@ class testConnection(unittest.TestCase): ...@@ -391,19 +391,19 @@ class testConnection(unittest.TestCase):
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=None, addr=("127.0.0.7", 93413)) connector=None, addr=("127.0.0.7", 93413))
self.assertEqual(bc.getConnector(), None) self.assertEqual(bc.getConnector(), None)
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.addPacket(p) bc.addPacket(p)
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 0) self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 0)
# new packet # new packet
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.addPacket(p) bc.addPacket(p)
self.assertEqual(bc.write_buf, ["testdata"]) self.assertEqual(bc.write_buf, "testdata")
self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 1) self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 1)
# packet witch raise protocol error # packet witch raise protocol error
...@@ -421,14 +421,14 @@ class testConnection(unittest.TestCase): ...@@ -421,14 +421,14 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
bc.addPacket(p) bc.addPacket(p)
self.assertNotEqual(bc.write_buf, ["testdata"]) self.assertNotEqual(bc.write_buf, "testdata")
self.assertEqual(len(bc.write_buf), 1) self.assertEqual(len(bc.write_buf), len(p.encode()))
self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 2) self.assertEquals(len(em.mockGetNamedCalls("addWriter")), 2)
# check it sends error packet # check it sends error packet
packet = Packet.parse(bc.write_buf[0]) packet = Packet.parse(bc.write_buf)
self.assertEqual(packet.getType(), ERROR) self.assertEqual(packet.getType(), ERROR)
code, message = packet.decode() code, message = packet.decode()
self.assertEqual(code, INTERNAL_ERROR_CODE) self.assertEqual(code, INTERNAL_ERROR_CODE)
...@@ -469,12 +469,12 @@ class testConnection(unittest.TestCase): ...@@ -469,12 +469,12 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
bc.analyse() bc.analyse()
self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0) self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 0) self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 0)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
# give some data to analyse # give some data to analyse
...@@ -485,7 +485,7 @@ class testConnection(unittest.TestCase): ...@@ -485,7 +485,7 @@ class testConnection(unittest.TestCase):
("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID())) ("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID()))
p.answerPrimaryMaster(1, getNewUUID(), master_list) p.answerPrimaryMaster(1, getNewUUID(), master_list)
data = p.encode() data = p.encode()
bc.read_buf.append(data) bc.read_buf += data
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
bc.analyse() bc.analyse()
# check packet decoded # check packet decoded
...@@ -497,7 +497,7 @@ class testConnection(unittest.TestCase): ...@@ -497,7 +497,7 @@ class testConnection(unittest.TestCase):
self.assertEqual(data.getId(), p.getId()) self.assertEqual(data.getId(), p.getId())
self.assertEqual(data.decode(), p.decode()) self.assertEqual(data.decode(), p.decode())
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
# give multiple packet # give multiple packet
em = Mock() em = Mock()
...@@ -512,7 +512,7 @@ class testConnection(unittest.TestCase): ...@@ -512,7 +512,7 @@ class testConnection(unittest.TestCase):
("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID())) ("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID()))
p1.answerPrimaryMaster(1, getNewUUID(), master_list) p1.answerPrimaryMaster(1, getNewUUID(), master_list)
data = p1.encode() data = p1.encode()
bc.read_buf.append(data) bc.read_buf += data
# packet 2 # packet 2
p2 = Packet() p2 = Packet()
master_list = (("127.0.0.1", 2135, getNewUUID()), ("127.0.0.1", 2135, getNewUUID()), master_list = (("127.0.0.1", 2135, getNewUUID()), ("127.0.0.1", 2135, getNewUUID()),
...@@ -521,8 +521,8 @@ class testConnection(unittest.TestCase): ...@@ -521,8 +521,8 @@ class testConnection(unittest.TestCase):
("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID())) ("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID()))
p2.answerPrimaryMaster(2, getNewUUID(), master_list) p2.answerPrimaryMaster(2, getNewUUID(), master_list)
data = p2.encode() data = p2.encode()
bc.read_buf.append(data) bc.read_buf += data
self.assertEqual(len(bc.read_buf), 2) self.assertEqual(len(bc.read_buf), len(p1.encode()) + len(p2.encode()))
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
bc.analyse() bc.analyse()
# check two packets decoded # check two packets decoded
...@@ -548,11 +548,11 @@ class testConnection(unittest.TestCase): ...@@ -548,11 +548,11 @@ class testConnection(unittest.TestCase):
handler = Mock() handler = Mock()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
bc.read_buf.append("datadatadatadata") bc.read_buf += "datadatadatadata"
self.assertEqual(len(bc.read_buf), 1) self.assertEqual(len(bc.read_buf), 16)
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
bc.analyse() bc.analyse()
self.assertEqual(len(bc.read_buf), 1) self.assertEqual(len(bc.read_buf), 16)
self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 0) self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 0)
self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0) self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0)
...@@ -569,7 +569,7 @@ class testConnection(unittest.TestCase): ...@@ -569,7 +569,7 @@ class testConnection(unittest.TestCase):
("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID())) ("127.0.0.1", 2435, getNewUUID()),("127.0.0.1", 2132, getNewUUID()))
p.answerPrimaryMaster(1, getNewUUID(), master_list) p.answerPrimaryMaster(1, getNewUUID(), master_list)
data = p.encode() data = p.encode()
bc.read_buf.append(data) bc.read_buf += data
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
bc.expectMessage(1) bc.expectMessage(1)
self.assertEqual(len(bc.event_dict), 1) self.assertEqual(len(bc.event_dict), 1)
...@@ -583,7 +583,7 @@ class testConnection(unittest.TestCase): ...@@ -583,7 +583,7 @@ class testConnection(unittest.TestCase):
self.assertEqual(data.getId(), p.getId()) self.assertEqual(data.getId(), p.getId())
self.assertEqual(data.decode(), p.decode()) self.assertEqual(data.decode(), p.decode())
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
def test_10_Connection_writable(self): def test_10_Connection_writable(self):
# with pending operation after send # with pending operation after send
...@@ -595,8 +595,8 @@ class testConnection(unittest.TestCase): ...@@ -595,8 +595,8 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
...@@ -606,7 +606,7 @@ class testConnection(unittest.TestCase): ...@@ -606,7 +606,7 @@ class testConnection(unittest.TestCase):
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, ["data"]) self.assertEqual(bc.write_buf, "data")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
# pending, so nothing called # pending, so nothing called
...@@ -627,8 +627,8 @@ class testConnection(unittest.TestCase): ...@@ -627,8 +627,8 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
...@@ -638,7 +638,7 @@ class testConnection(unittest.TestCase): ...@@ -638,7 +638,7 @@ class testConnection(unittest.TestCase):
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
# nothing else pending, and aborted is false, so writer has been removed # nothing else pending, and aborted is false, so writer has been removed
...@@ -658,8 +658,8 @@ class testConnection(unittest.TestCase): ...@@ -658,8 +658,8 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
bc.abort() bc.abort()
...@@ -670,7 +670,7 @@ class testConnection(unittest.TestCase): ...@@ -670,7 +670,7 @@ class testConnection(unittest.TestCase):
call = connector.mockGetNamedCalls("send")[0] call = connector.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 1)
# nothing else pending, and aborted is false, so writer has been removed # nothing else pending, and aborted is false, so writer has been removed
...@@ -701,12 +701,12 @@ class testConnection(unittest.TestCase): ...@@ -701,12 +701,12 @@ class testConnection(unittest.TestCase):
connector = DoNothingConnector() connector = DoNothingConnector()
bc = Connection(em, handler, connector_handler=DoNothingConnector, bc = Connection(em, handler, connector_handler=DoNothingConnector,
connector=connector, addr=("127.0.0.7", 93413)) connector=connector, addr=("127.0.0.7", 93413))
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
bc.readable() bc.readable()
# check packet decoded # check packet decoded
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0) self.assertEquals(len(em.mockGetNamedCalls("removeIdleEvent")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 1) self.assertEquals(len(handler.mockGetNamedCalls("packetReceived")), 1)
call = handler.mockGetNamedCalls("packetReceived")[0] call = handler.mockGetNamedCalls("packetReceived")[0]
...@@ -714,7 +714,7 @@ class testConnection(unittest.TestCase): ...@@ -714,7 +714,7 @@ class testConnection(unittest.TestCase):
self.assertEqual(data.getType(), ANSWER_PRIMARY_MASTER) self.assertEqual(data.getType(), ANSWER_PRIMARY_MASTER)
self.assertEqual(data.getId(), 1) self.assertEqual(data.getId(), 1)
self.assertEqual(len(bc.event_dict), 0) self.assertEqual(len(bc.event_dict), 0)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
# check not aborted # check not aborted
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0) self.assertEquals(len(em.mockGetNamedCalls("unregister")), 0)
...@@ -820,8 +820,8 @@ class testConnection(unittest.TestCase): ...@@ -820,8 +820,8 @@ class testConnection(unittest.TestCase):
# check connector created and connection initialize # check connector created and connection initialize
self.assertFalse(bc.connecting) self.assertFalse(bc.connecting)
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
# call # call
...@@ -836,7 +836,7 @@ class testConnection(unittest.TestCase): ...@@ -836,7 +836,7 @@ class testConnection(unittest.TestCase):
call = conn.mockGetNamedCalls("send")[0] call = conn.mockGetNamedCalls("send")[0]
data = call.getParam(0) data = call.getParam(0)
self.assertEquals(data, "testdata") self.assertEquals(data, "testdata")
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 1) self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 1)
self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 0)
...@@ -864,8 +864,8 @@ class testConnection(unittest.TestCase): ...@@ -864,8 +864,8 @@ class testConnection(unittest.TestCase):
# check connector created and connection initialize # check connector created and connection initialize
bc.connecting = True bc.connecting = True
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
# call # call
...@@ -876,7 +876,7 @@ class testConnection(unittest.TestCase): ...@@ -876,7 +876,7 @@ class testConnection(unittest.TestCase):
self.assertFalse(bc.connecting) self.assertFalse(bc.connecting)
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
self.assertEqual(bc.write_buf, ["testdata"]) self.assertEqual(bc.write_buf, "testdata")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 2) self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 2)
self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 0)
...@@ -900,8 +900,8 @@ class testConnection(unittest.TestCase): ...@@ -900,8 +900,8 @@ class testConnection(unittest.TestCase):
# check connector created and connection initialize # check connector created and connection initialize
bc.connecting = True bc.connecting = True
self.assertNotEqual(bc.getConnector(), None) self.assertNotEqual(bc.getConnector(), None)
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
bc.write_buf = ["testdata",] bc.write_buf = "testdata"
self.assertTrue(bc.pending()) self.assertTrue(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
# call # call
...@@ -912,7 +912,7 @@ class testConnection(unittest.TestCase): ...@@ -912,7 +912,7 @@ class testConnection(unittest.TestCase):
self.assertTrue(bc.connecting) self.assertTrue(bc.connecting)
self.assertFalse(bc.pending()) self.assertFalse(bc.pending())
self.assertFalse(bc.aborted) self.assertFalse(bc.aborted)
self.assertEqual(bc.write_buf, ["testdata"]) self.assertEqual(bc.write_buf, "testdata")
self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0) self.assertEquals(len(handler.mockGetNamedCalls("connectionClosed")), 0)
self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 1) self.assertEquals(len(handler.mockGetNamedCalls("connectionCompleted")), 1)
self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 1) self.assertEquals(len(handler.mockGetNamedCalls("connectionFailed")), 1)
...@@ -930,8 +930,8 @@ class testConnection(unittest.TestCase): ...@@ -930,8 +930,8 @@ class testConnection(unittest.TestCase):
self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413)) self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413))
self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0) self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0)
self.assertEqual(bc.getConnector(), None) self.assertEqual(bc.getConnector(), None)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEqual(bc.cur_id, 0) self.assertEqual(bc.cur_id, 0)
self.assertEqual(bc.event_dict, {}) self.assertEqual(bc.event_dict, {})
self.assertEqual(bc.aborted, False) self.assertEqual(bc.aborted, False)
...@@ -1050,8 +1050,8 @@ class testConnection(unittest.TestCase): ...@@ -1050,8 +1050,8 @@ class testConnection(unittest.TestCase):
self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413)) self.assertEqual(bc.getAddress(), ("127.0.0.7", 93413))
self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0) self.assertEqual(len(em.mockGetNamedCalls("addReader")), 0)
self.assertEqual(bc.getConnector(), None) self.assertEqual(bc.getConnector(), None)
self.assertEqual(bc.read_buf, []) self.assertEqual(bc.read_buf, '')
self.assertEqual(bc.write_buf, []) self.assertEqual(bc.write_buf, '')
self.assertEqual(bc.cur_id, 0) self.assertEqual(bc.cur_id, 0)
self.assertEqual(bc.event_dict, {}) self.assertEqual(bc.event_dict, {})
self.assertEqual(bc.aborted, False) self.assertEqual(bc.aborted, False)
......
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