From f76fe5e469a6490335a45df109c6a1225afc8514 Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Wed, 31 Mar 2021 23:01:22 +0000 Subject: [PATCH] ci: fix some test timeouts --- test/functional/feature_dynafed.py | 2 +- test/functional/feature_sighash_rangeproof.py | 5 ++++- test/functional/test_runner.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/functional/feature_dynafed.py b/test/functional/feature_dynafed.py index 5924671d25..61e7bac593 100755 --- a/test/functional/feature_dynafed.py +++ b/test/functional/feature_dynafed.py @@ -122,7 +122,7 @@ class DynaFedTest(BitcoinTestFramework): # Move chain forward to activation, any new blocks will be enforced blocks += self.nodes[0].generatetoaddress(144, self.nodes[0].getnewaddress()) - self.sync_all() + self.sync_blocks(timeout=240) assert_equal(self.nodes[0].getblockchaininfo()["softforks"]["dynafed"]["bip9"]["status"], "active") # Existing blocks should have null dynafed fields diff --git a/test/functional/feature_sighash_rangeproof.py b/test/functional/feature_sighash_rangeproof.py index f35e8ac57b..9c392c9e89 100755 --- a/test/functional/feature_sighash_rangeproof.py +++ b/test/functional/feature_sighash_rangeproof.py @@ -188,7 +188,10 @@ class SighashRangeproofTest(BitcoinTestFramework): self.assert_tx_valid(tx, True) # Activate dynafed (nb of blocks taken from dynafed activation test) - self.nodes[0].generate(1006 + 1 + 144 + 144) + # Generate acress several calls to `generatetoaddress` to ensure no individual call times out + self.nodes[0].generate(503) + self.nodes[0].generate(503) + self.nodes[0].generate(1 + 144 + 144) assert_equal(self.nodes[0].getblockchaininfo()["softforks"]["dynafed"]["bip9"]["status"], "active") self.sync_all() diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 4c5d245636..959845f1f8 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -91,6 +91,8 @@ BASE_SCRIPTS = [ 'feature_fedpeg.py --pre_transition', 'feature_fedpeg.py --post_transition', 'feature_mandatory_coinbase.py', + 'feature_dynafed.py', + 'feature_sighash_rangeproof.py', 'feature_block_subsidy.py', 'feature_connect_genesis_outputs.py', 'feature_block_v4.py', @@ -105,8 +107,6 @@ BASE_SCRIPTS = [ 'feature_assetsdir.py', 'feature_initial_reissuance_token.py', 'feature_progress.py', - 'feature_dynafed.py', - 'feature_sighash_rangeproof.py', # Longest test should go first, to favor running tests in parallel 'wallet_hd.py', 'wallet_hd.py --descriptors',