Przeglądaj źródła

[tests] Make p2p-leaktests.py more robust

Github-Pull: #11078
Rebased-From: 0063d2c3dc
tags/v0.15.1
John Newbery 4 lat temu
rodzic
commit
f1ced0d776

+ 7
- 2
test/functional/p2p-leaktests.py Wyświetl plik

@@ -139,6 +139,9 @@ class P2PLeakTest(BitcoinTestFramework):

[conn.disconnect_node() for conn in connections]

# Wait until all connections are closed
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 0)

# Make sure no unexpected messages came in
assert(no_version_bannode.unexpected_msg == False)
assert(no_version_idlenode.unexpected_msg == False)
@@ -157,8 +160,10 @@ class P2PLeakTest(BitcoinTestFramework):
allowed_service_bit5_node.add_connection(connections[5])
allowed_service_bit7_node.add_connection(connections[6])

wait_until(lambda: allowed_service_bit5_node.message_count["verack"], timeout=10, lock=mininode_lock)
wait_until(lambda: allowed_service_bit7_node.message_count["verack"], timeout=10, lock=mininode_lock)
NetworkThread().start() # Network thread stopped when all previous NodeConnCBs disconnected. Restart it

wait_until(lambda: allowed_service_bit5_node.message_count["verack"], lock=mininode_lock)
wait_until(lambda: allowed_service_bit7_node.message_count["verack"], lock=mininode_lock)

if __name__ == '__main__':
P2PLeakTest().main()

+ 1
- 0
test/functional/test_framework/mininode.py Wyświetl plik

@@ -1837,6 +1837,7 @@ class NetworkThread(Thread):
disconnected.append(obj)
[ obj.handle_close() for obj in disconnected ]
asyncore.loop(0.1, use_poll=True, map=mininode_socket_map, count=1)
logger.debug("Network thread closing")


# An exception we can raise if we detect a potential disconnect

Ładowanie…
Anuluj
Zapisz