Skip to content

Commit 318890b

Browse files
author
MarcoFalke
committed
Merge #16888: test: Bump timeouts in slow running tests
fa502cb test: Bump timeouts in slow running tests (MarcoFalke) Pull request description: Fixes #16794 ACKs for top commit: jamesob: ACK bitcoin/bitcoin@fa502cb Tree-SHA512: 52d1a6f9febe066332cc9df40638fdc3e8aaf1990caf912073b42f2f6615879da5512533ff71b85b4865034bc30da46945d34916669068e004e68058aeb04e90
2 parents f18a906 + fa502cb commit 318890b

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

test/functional/feature_assumevalid.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
CTxIn,
4141
CTxOut,
4242
msg_block,
43-
msg_headers
43+
msg_headers,
4444
)
4545
from test_framework.mininode import P2PInterface
4646
from test_framework.script import (CScript, OP_TRUE)
@@ -180,7 +180,7 @@ def run_test(self):
180180
for i in range(2202):
181181
p2p1.send_message(msg_block(self.blocks[i]))
182182
# Syncing 2200 blocks can take a while on slow systems. Give it plenty of time to sync.
183-
p2p1.sync_with_ping(200)
183+
p2p1.sync_with_ping(960)
184184
assert_equal(self.nodes[1].getblock(self.nodes[1].getbestblockhash())['height'], 2202)
185185

186186
# Send blocks to node2. Block 102 will be rejected.

test/functional/feature_block.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ def run_test(self):
12611261
self.save_spendable_output()
12621262
spend = self.get_spendable_output()
12631263

1264-
self.send_blocks(blocks, True, timeout=480)
1264+
self.send_blocks(blocks, True, timeout=960)
12651265
chain1_tip = i
12661266

12671267
# now create alt chain of same length
@@ -1273,14 +1273,14 @@ def run_test(self):
12731273

12741274
# extend alt chain to trigger re-org
12751275
block = self.next_block("alt" + str(chain1_tip + 1), version=4)
1276-
self.send_blocks([block], True, timeout=480)
1276+
self.send_blocks([block], True, timeout=960)
12771277

12781278
# ... and re-org back to the first chain
12791279
self.move_tip(chain1_tip)
12801280
block = self.next_block(chain1_tip + 1, version=4)
12811281
self.send_blocks([block], False, force_send=True)
12821282
block = self.next_block(chain1_tip + 2, version=4)
1283-
self.send_blocks([block], True, timeout=480)
1283+
self.send_blocks([block], True, timeout=960)
12841284

12851285
self.log.info("Reject a block with an invalid block header version")
12861286
b_v1 = self.next_block('b_v1', version=1)

test/functional/feature_dbcrash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ChainstateWriteCrashTest(BitcoinTestFramework):
5050
def set_test_params(self):
5151
self.num_nodes = 4
5252
self.setup_clean_chain = False
53-
self.rpc_timeout = 180
53+
self.rpc_timeout = 480
5454

5555
# Set -maxmempool=0 to turn off mempool memory sharing with dbcache
5656
# Set -rpcservertimeout=900 to reduce socket disconnects in this

test/functional/feature_pruning.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def set_test_params(self):
9292
["-maxreceivebuffer=20000"],
9393
["-prune=550"],
9494
]
95+
self.rpc_timeout = 120
9596

9697
def skip_test_if_missing_module(self):
9798
self.skip_if_no_wallet()

test/functional/p2p_invalid_messages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def run_test(self):
8585

8686
# Peer 1, despite serving up a bunch of nonsense, should still be connected.
8787
self.log.info("Waiting for node to drop junk messages.")
88-
node.p2p.sync_with_ping(timeout=120)
88+
node.p2p.sync_with_ping(timeout=320)
8989
assert node.p2p.is_connected
9090

9191
#

test/functional/tool_wallet.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class ToolWalletTest(BitcoinTestFramework):
1919
def set_test_params(self):
2020
self.num_nodes = 1
2121
self.setup_clean_chain = True
22+
self.rpc_timeout = 120
2223

2324
def skip_test_if_missing_module(self):
2425
self.skip_if_no_wallet()

test/functional/wallet_backup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def set_test_params(self):
4949
self.setup_clean_chain = True
5050
# nodes 1, 2,3 are spenders, let's give them a keypool=100
5151
self.extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]
52+
self.rpc_timeout = 120
5253

5354
def skip_test_if_missing_module(self):
5455
self.skip_if_no_wallet()

0 commit comments

Comments
 (0)