aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-08-18 09:22:57 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-08-18 09:23:31 +0200
commit35f64e45c207960078eef58ccc50d91e4abc2c55 (patch)
treec66e33f3f704cc8cf529e635f8d299adbc05c703 /qa
parent671fdae5f5b34d89a86070ce45bbe95f01752719 (diff)
downloadbitcoin-35f64e45c207960078eef58ccc50d91e4abc2c55.tar.xz
Revert "[qa] Adjust timeouts for micro-optimization of run time"
This reverts commit fa2d68f79c459b505652728c3d8da60679f98ae3. Temporary revert - see discussion in #8532.
Diffstat (limited to 'qa')
-rw-r--r--qa/rpc-tests/test_framework/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 586e2a07ba..190fa7f661 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -121,7 +121,7 @@ def hex_str_to_bytes(hex_str):
def str_to_b64str(string):
return b64encode(string.encode('utf-8')).decode('ascii')
-def sync_blocks(rpc_connections, wait=0.125, timeout=60):
+def sync_blocks(rpc_connections, wait=1, timeout=60):
"""
Wait until everybody has the same tip
"""
@@ -133,7 +133,7 @@ def sync_blocks(rpc_connections, wait=0.125, timeout=60):
timeout -= wait
raise AssertionError("Block sync failed")
-def sync_mempools(rpc_connections, wait=0.5, timeout=60):
+def sync_mempools(rpc_connections, wait=1, timeout=60):
"""
Wait until everybody has the same transactions in their memory
pools