aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2017-02-21 12:57:30 -0500
committerRussell Yanofsky <russ@yanofsky.org>2017-02-21 12:57:30 -0500
commit874c7363d794c18a3b46d3d2a03f19c88f3a20cf (patch)
tree6b12cca621b6fd955f3a211b7f091b86ebf2f39a /qa
parent8528d6ac6d51fe1a2d6fc9f0e2591c5503798bd5 (diff)
downloadbitcoin-874c7363d794c18a3b46d3d2a03f19c88f3a20cf.tar.xz
Fix pruning test broken by 2 hour manual prune window
Regression happened in 91fb506 Add two hour buffer to manual pruning.
Diffstat (limited to 'qa')
-rwxr-xr-xqa/rpc-tests/pruning.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 9d155478e2..1e6d419186 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -18,6 +18,11 @@ import os
MIN_BLOCKS_TO_KEEP = 288
+# Rescans start at the earliest block up to 2 hours before a key timestamp, so
+# the manual prune RPC avoids pruning blocks in the same window to be
+# compatible with pruning based on key creation time.
+RESCAN_WINDOW = 2 * 60 * 60
+
def calc_usage(blockdir):
return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f)) / (1024. * 1024.)
@@ -239,7 +244,7 @@ class PruneTest(BitcoinTestFramework):
def height(index):
if use_timestamp:
- return node.getblockheader(node.getblockhash(index))["time"]
+ return node.getblockheader(node.getblockhash(index))["time"] + RESCAN_WINDOW
else:
return index