nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6836

Browse Source 
163f83720 functional_tests: rewrite mining code, clearer timeout info (iamamyth)
This commit is contained in:
Alexander Blair 2020-09-27 16:15:52 -07:00
commit 687f2b3c8d
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/functional_tests/mining.py
View File

@ -95,20 +95,19 @@ class MiningTest():
assert res_status.block_reward >= 600000000000 assert res_status.block_reward >= 600000000000
# wait till we mined a few of them # wait till we mined a few of them
target_height = prev_height + 5
height = prev_height
timeout = 60 # randomx is slow to init timeout = 60 # randomx is slow to init
timeout_height = prev_height while height < target_height:
while True: seen_height = height
for _ in range(timeout):
time.sleep(1) time.sleep(1)
res_info = daemon.get_info() height = daemon.get_info().height
height = res_info.height if height > seen_height:
if height >= prev_height + 5:
break break
if height > timeout_height:
timeout = 5
timeout_height = height
else: else:
timeout -= 1 assert False, 'Failed to mine successor to block %d (initial block = %d)' % (seen_height, prev_height)
assert timeout >= 0 timeout = 5
if via_daemon: if via_daemon:
res = daemon.stop_mining() res = daemon.stop_mining()