aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-03-12 09:15:40 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-03-12 09:15:43 -0400
commit2737197ff39f98b0fbdf0fe913c1a7c8ee0f318c (patch)
tree46eea8012dc0baa2ff3602f856625949e8819b50
parent4c42a13205a1b75c9b4c171d4eae4716dca646e3 (diff)
parentfa2cf85e6f366d62ebf173bf0bd51af45806afe1 (diff)
Merge #18213: test: Fix race in p2p_segwit
fa2cf85e6f366d62ebf173bf0bd51af45806afe1 test: Fix race in p2p_segwit (MarcoFalke) Pull request description: Fixes #11696 Top commit has no ACKs. Tree-SHA512: 09de07ea26236547586f5c373a0df2b68d84af5cfa8f40bd2ca9f951fc083c5f4b8a472a60668d99118bbd9f3942ec3d6a34f05944d47345acca41c95475bb27
-rwxr-xr-xtest/functional/p2p_segwit.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
index ad5a124680..785c476e19 100755
--- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@@ -147,6 +147,11 @@ class TestP2PConn(P2PInterface):
super().__init__()
self.getdataset = set()
+ # Avoid sending out msg_getdata in the mininode thread as a reply to invs.
+ # They are not needed and would only lead to races because we send msg_getdata out in the test thread
+ def on_inv(self, message):
+ pass
+
def on_getdata(self, message):
for inv in message.inv:
self.getdataset.add(inv.hash)