zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "[qa] Adjust timeouts for micro-optimization of run time" 

This reverts commit fa2d68f79c.

Temporary revert - see discussion in #8532.
This commit is contained in:
Wladimir J. van der Laan 2016-08-18 09:22:57 +02:00
parent 671fdae5f5
commit 35f64e45c2
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rpc-tests/test_framework/util.py
View File

@ -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