From e607643bb7604884443d7530ff8cdd8582114632 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 30 Apr 2019 10:09:51 -0400 Subject: [PATCH] Merge #15696: [qa] test_runner: Move feature_pruning to base tests fafb55e2c2 [qa] test_runner: Move feature_pruning to base tests (MarcoFalke) 8728a66782 [tests] fix block time in feature_pruning.py (John Newbery) Pull request description: ACKs for commit fafb55: Tree-SHA512: 88abef94379fbad6629da11dccb080d5f0644490d6f2cc2756a33fac34bcf72e84245cef596dfae5a40f7a99b3f4da0dd85d306d4c1b452d310d3f36eef75a8b --- test/functional/feature_pruning.py | 13 +++++++------ test/functional/test_runner.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index a6d40cf0d7..dd45a524fc 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -28,16 +28,17 @@ def mine_large_blocks(node, n): # followed by 950k of OP_NOP. This would be non-standard in a non-coinbase # transaction but is consensus valid. + # Set the nTime if this is the first time this function has been called. + # A static variable ensures that time is monotonicly increasing and is therefore + # different for each block created => blockhash is unique. + if "nTimes" not in mine_large_blocks.__dict__: + mine_large_blocks.nTime = 0 + # Get the block parameters for the first block big_script = CScript([OP_RETURN] + [OP_NOP] * 950000) best_block = node.getblock(node.getbestblockhash()) height = int(best_block["height"]) + 1 - try: - # Static variable ensures that time is monotonicly increasing and is therefore - # different for each block created => blockhash is unique. - mine_large_blocks.nTime = min(mine_large_blocks.nTime, int(best_block["time"])) + 1 - except AttributeError: - mine_large_blocks.nTime = int(best_block["time"]) + 1 + mine_large_blocks.nTime = max(mine_large_blocks.nTime, int(best_block["time"])) + 1 previousblockhash = int(best_block["hash"], 16) for _ in range(n): diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 47ea1f3fc5..92f6acb20c 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -72,6 +72,7 @@ BASE_SCRIPTS = [ 'feature_dip3_deterministicmns.py', # NOTE: needs dash_hash to pass 'feature_block_reward_reallocation.py', 'feature_llmq_data_recovery.py', + 'feature_pruning.py', # NOTE: Prune mode is incompatible with -txindex, should work with governance validation disabled though. 'feature_fee_estimation.py', 'wallet_hd.py', 'wallet_backup.py', @@ -230,7 +231,6 @@ BASE_SCRIPTS = [ EXTENDED_SCRIPTS = [ # These tests are not run by default. # Longest test should go first, to favor running tests in parallel - 'feature_pruning.py', # NOTE: Prune mode is incompatible with -txindex, should work with governance validation disabled though. 'feature_dbcrash.py', ]