aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-12-20 06:44:46 +1300
committerMarcoFalke <falke.marco@gmail.com>2018-12-20 08:06:28 +1300
commitfa05d52af475dc4109c09b70b17b22f5ffc6e6e6 (patch)
tree73550be78d7eb89d36506c815d18de93aaabe7c3 /test
parentcb52cee29d0d8be062c22e59299b8e332da340c5 (diff)
downloadbitcoin-fa05d52af475dc4109c09b70b17b22f5ffc6e6e6.tar.xz
test: Bump timeout to run tests in travis thread sanitizer
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/feature_block.py6
-rwxr-xr-xtest/functional/p2p_invalid_messages.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
index e50f67a345..b741339351 100755
--- a/test/functional/feature_block.py
+++ b/test/functional/feature_block.py
@@ -1181,7 +1181,7 @@ class FullBlockTest(BitcoinTestFramework):
self.save_spendable_output()
spend = self.get_spendable_output()
- self.sync_blocks(blocks, True, timeout=180)
+ self.sync_blocks(blocks, True, timeout=480)
chain1_tip = i
# now create alt chain of same length
@@ -1193,14 +1193,14 @@ class FullBlockTest(BitcoinTestFramework):
# extend alt chain to trigger re-org
block = self.next_block("alt" + str(chain1_tip + 1))
- self.sync_blocks([block], True, timeout=180)
+ self.sync_blocks([block], True, timeout=480)
# ... and re-org back to the first chain
self.move_tip(chain1_tip)
block = self.next_block(chain1_tip + 1)
self.sync_blocks([block], False, force_send=True)
block = self.next_block(chain1_tip + 2)
- self.sync_blocks([block], True, timeout=180)
+ self.sync_blocks([block], True, timeout=480)
# Helper methods
################
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
index 65997a5f9d..dbc5c5fff6 100755
--- a/test/functional/p2p_invalid_messages.py
+++ b/test/functional/p2p_invalid_messages.py
@@ -86,7 +86,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=30)
+ node.p2p.sync_with_ping(timeout=120)
assert node.p2p.is_connected
#