From fab47375fe0bdec1e557e087fdb0707c4dfa7cc2 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 23 May 2020 09:42:21 -0400 Subject: [PATCH 1/3] test: pep-8 p2p_getdata.py --- test/functional/p2p_getdata.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/p2p_getdata.py b/test/functional/p2p_getdata.py index fd94a09d802..bbecd2cf817 100755 --- a/test/functional/p2p_getdata.py +++ b/test/functional/p2p_getdata.py @@ -16,8 +16,8 @@ from test_framework.mininode import ( from test_framework.test_framework import BitcoinTestFramework from test_framework.util import wait_until -class P2PStoreBlock(P2PInterface): +class P2PStoreBlock(P2PInterface): def __init__(self): super().__init__() self.blocks = defaultdict(int) @@ -26,6 +26,7 @@ class P2PStoreBlock(P2PInterface): message.block.calc_sha256() self.blocks[message.block.sha256] += 1 + class GetdataTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 @@ -47,5 +48,6 @@ class GetdataTest(BitcoinTestFramework): self.nodes[0].p2ps[0].send_and_ping(good_getdata) wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1, timeout=30, lock=mininode_lock) + if __name__ == '__main__': GetdataTest().main() From 999922baed3a80b581ce46daa01c4cbca4fcbfd8 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 23 May 2020 09:47:55 -0400 Subject: [PATCH 2/3] test: Default mininode.wait_until timeout to 60s --- test/functional/test_framework/mininode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 95a63717d60..9fdd3cfe825 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -371,7 +371,7 @@ class P2PInterface(P2PConnection): # Connection helper methods - def wait_until(self, test_function, timeout): + def wait_until(self, test_function, timeout=60): wait_until(test_function, timeout=timeout, lock=mininode_lock, timeout_factor=self.timeout_factor) def wait_for_disconnect(self, timeout=60): From fa80b4788bbe3ef00c5d767c0d89ba9809d8707c Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 23 May 2020 09:49:16 -0400 Subject: [PATCH 3/3] test: Remove global wait_until from p2p_getdata --- test/functional/p2p_getdata.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/functional/p2p_getdata.py b/test/functional/p2p_getdata.py index bbecd2cf817..d1b11c2c613 100755 --- a/test/functional/p2p_getdata.py +++ b/test/functional/p2p_getdata.py @@ -9,12 +9,8 @@ from test_framework.messages import ( CInv, msg_getdata, ) -from test_framework.mininode import ( - mininode_lock, - P2PInterface, -) +from test_framework.mininode import P2PInterface from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import wait_until class P2PStoreBlock(P2PInterface): @@ -32,21 +28,21 @@ class GetdataTest(BitcoinTestFramework): self.num_nodes = 1 def run_test(self): - self.nodes[0].add_p2p_connection(P2PStoreBlock()) + p2p_block_store = self.nodes[0].add_p2p_connection(P2PStoreBlock()) self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages") # Send invalid message and verify that node responds to later ping invalid_getdata = msg_getdata() invalid_getdata.inv.append(CInv(t=0, h=0)) # INV type 0 is invalid. - self.nodes[0].p2ps[0].send_and_ping(invalid_getdata) + p2p_block_store.send_and_ping(invalid_getdata) # Check getdata still works by fetching tip block best_block = int(self.nodes[0].getbestblockhash(), 16) good_getdata = msg_getdata() good_getdata.inv.append(CInv(t=2, h=best_block)) - self.nodes[0].p2ps[0].send_and_ping(good_getdata) - wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1, timeout=30, lock=mininode_lock) + p2p_block_store.send_and_ping(good_getdata) + p2p_block_store.wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1) if __name__ == '__main__':