Skip to content

Commit cbc32d6

Browse files
committed
Merge #18249: test: Bump timeouts to accomodate really slow disks
fa6df0d test: Bump timeouts to accomodate really slow disks (MarcoFalke) Pull request description: Needed these patches locally for some arm machines with slow storage ACKs for top commit: practicalswift: ACK fa6df0d fanquake: ACK fa6df0d Tree-SHA512: 22f2f6f7ed05f26013431126bb179b029dbc931f02d0e58f8970c6d477f43e3106d76c9732942034cb2cfcb827191e338a082f953ccb69531a19ee6dab9a7e1a
2 parents 2492dc0 + fa6df0d commit cbc32d6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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=960)
1264+
self.send_blocks(blocks, True, timeout=1920)
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=960)
1276+
self.send_blocks([block], True, timeout=1920)
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=960)
1283+
self.send_blocks([block], True, timeout=1920)
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/fuzz/test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def main():
134134
os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', test_list_selection[0]),
135135
'-help=1',
136136
],
137-
timeout=10,
137+
timeout=20,
138138
check=True,
139139
stderr=subprocess.PIPE,
140140
universal_newlines=True,

0 commit comments

Comments
 (0)