diff options
| author | fanquake <fanquake@gmail.com> | 2020-03-05 14:50:31 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-03-05 15:06:52 +0800 |
| commit | cbc32d67dc0cbe636ee3510802ae863bee73ac13 (patch) | |
| tree | 02cd17cfbf7ad8909b157eca9bd2c30b6103636b /test | |
| parent | 2492dc0068f84e2cc4d776c87f489bce79afa47b (diff) | |
| parent | fa6df0de538c15a6d393830af373ac9af6f48125 (diff) | |
| download | bitcoin-cbc32d67dc0cbe636ee3510802ae863bee73ac13.tar.xz | |
Merge #18249: test: Bump timeouts to accomodate really slow disks
fa6df0de538c15a6d393830af373ac9af6f48125 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 fa6df0de538c15a6d393830af373ac9af6f48125
fanquake:
ACK fa6df0de538c15a6d393830af373ac9af6f48125
Tree-SHA512: 22f2f6f7ed05f26013431126bb179b029dbc931f02d0e58f8970c6d477f43e3106d76c9732942034cb2cfcb827191e338a082f953ccb69531a19ee6dab9a7e1a
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/feature_block.py | 6 | ||||
| -rwxr-xr-x | test/fuzz/test_runner.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index 95905f477b..38bf2faf89 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -1261,7 +1261,7 @@ class FullBlockTest(BitcoinTestFramework): self.save_spendable_output() spend = self.get_spendable_output() - self.send_blocks(blocks, True, timeout=960) + self.send_blocks(blocks, True, timeout=1920) chain1_tip = i # now create alt chain of same length @@ -1273,14 +1273,14 @@ class FullBlockTest(BitcoinTestFramework): # extend alt chain to trigger re-org block = self.next_block("alt" + str(chain1_tip + 1), version=4) - self.send_blocks([block], True, timeout=960) + self.send_blocks([block], True, timeout=1920) # ... and re-org back to the first chain self.move_tip(chain1_tip) block = self.next_block(chain1_tip + 1, version=4) self.send_blocks([block], False, force_send=True) block = self.next_block(chain1_tip + 2, version=4) - self.send_blocks([block], True, timeout=960) + self.send_blocks([block], True, timeout=1920) self.log.info("Reject a block with an invalid block header version") b_v1 = self.next_block('b_v1', version=1) diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py index 1a74c67503..36127c5bc6 100755 --- a/test/fuzz/test_runner.py +++ b/test/fuzz/test_runner.py @@ -134,7 +134,7 @@ def main(): os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', test_list_selection[0]), '-help=1', ], - timeout=10, + timeout=20, check=True, stderr=subprocess.PIPE, universal_newlines=True, |