aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-11-06 15:14:38 -0500
committerMarcoFalke <falke.marco@gmail.com>2018-11-06 15:14:44 -0500
commit976583e109518cb5cc20e727147c0681edaf123a (patch)
tree379d0650bfcf75ae1b15e89d568450a08f888e2e
parent6af27b81572b7b8e08ebcfe7eb533f40c66be4af (diff)
parent3d305e3b89ad9069775c3739f6ad7875d64574f7 (diff)
downloadbitcoin-976583e109518cb5cc20e727147c0681edaf123a.tar.xz
Merge #14672: tests: Send fewer spam messages in p2p_invalid_messages
3d305e3b89 Send fewer spam messages in p2p_invalid_messages (James O'Beirne) Pull request description: Builds on travis are failing because the test node isn't able to drop all the bad messages sent within the given timeout. Reduce the number of bad messages we're sending and increase the timeout to avoid failures on travis. Tree-SHA512: 11c389619d9590caf7eca74e0efe6d950469415d34220072770689024b350cc08a2d5ec90634237d87ff71ba8b638c1152b8a45ffbb2815a48bde6a88fbb8fc6
-rwxr-xr-xtest/functional/p2p_invalid_messages.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
index 85f035628f..a2d40fab1a 100755
--- a/test/functional/p2p_invalid_messages.py
+++ b/test/functional/p2p_invalid_messages.py
@@ -72,7 +72,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
"memory exhaustion. May take a bit...")
# Run a bunch of times to test for memory exhaustion.
- for _ in range(200):
+ for _ in range(80):
node.p2p.send_message(msg_at_size)
# Check that, even though the node is being hammered by nonsense from one
@@ -82,7 +82,7 @@ class InvalidMessagesTest(BitcoinTestFramework):
# Peer 1, despite serving up a bunch of nonsense, should still be connected.
self.log.info("Waiting for node to drop junk messages.")
- node.p2p.sync_with_ping(timeout=8)
+ node.p2p.sync_with_ping(timeout=30)
assert node.p2p.is_connected
#