mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
functional_tests: update cookie at 10 seconds interval
Otherwise the daemon will start rejecting
This commit is contained in:
parent
d1cf16364f
commit
e69acffdc8
@ -31,6 +31,7 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
"""Test daemon RPC payment calls
|
"""Test daemon RPC payment calls
|
||||||
"""
|
"""
|
||||||
@ -143,6 +144,7 @@ class RPCPaymentTest():
|
|||||||
found_valid = 0
|
found_valid = 0
|
||||||
found_invalid = 0
|
found_invalid = 0
|
||||||
last_credits = 0
|
last_credits = 0
|
||||||
|
loop_time = time.time()
|
||||||
while found_valid == 0 or found_invalid == 0:
|
while found_valid == 0 or found_invalid == 0:
|
||||||
nonce += 1
|
nonce += 1
|
||||||
try:
|
try:
|
||||||
@ -152,10 +154,17 @@ class RPCPaymentTest():
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
found_invalid += 1
|
found_invalid += 1
|
||||||
res = daemon.rpc_access_info(client = self.get_signature())
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
cookie = res.cookie
|
||||||
|
loop_time = time.time()
|
||||||
assert res.credits < last_credits or res.credits == 0
|
assert res.credits < last_credits or res.credits == 0
|
||||||
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
||||||
last_credits = res.credits
|
last_credits = res.credits
|
||||||
|
|
||||||
|
if time.time() >= loop_time + 10:
|
||||||
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
cookie = res.cookie
|
||||||
|
loop_time = time.time()
|
||||||
|
|
||||||
# we should now have 1 valid nonce, and a number of bad ones
|
# we should now have 1 valid nonce, and a number of bad ones
|
||||||
res = daemon.rpc_access_info(client = self.get_signature())
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
assert len(res.hashing_blob) > 39
|
assert len(res.hashing_blob) > 39
|
||||||
@ -176,6 +185,7 @@ class RPCPaymentTest():
|
|||||||
assert e.nonces_dupe == 0
|
assert e.nonces_dupe == 0
|
||||||
|
|
||||||
# Try random nonces till we find one that's valid so we get a load of credits
|
# Try random nonces till we find one that's valid so we get a load of credits
|
||||||
|
loop_time = time.time()
|
||||||
while last_credits == 0:
|
while last_credits == 0:
|
||||||
nonce += 1
|
nonce += 1
|
||||||
try:
|
try:
|
||||||
@ -186,6 +196,10 @@ class RPCPaymentTest():
|
|||||||
except:
|
except:
|
||||||
found_invalid += 1
|
found_invalid += 1
|
||||||
assert nonce < 1000 # can't find a valid none -> the RPC probably fails
|
assert nonce < 1000 # can't find a valid none -> the RPC probably fails
|
||||||
|
if time.time() >= loop_time + 10:
|
||||||
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
cookie = res.cookie
|
||||||
|
loop_time = time.time()
|
||||||
|
|
||||||
# we should now have at least 5000
|
# we should now have at least 5000
|
||||||
res = daemon.rpc_access_info(client = self.get_signature())
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
@ -208,6 +222,7 @@ class RPCPaymentTest():
|
|||||||
res = daemon.rpc_access_info(client = self.get_signature())
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
cookie = res.cookie
|
cookie = res.cookie
|
||||||
old_cookie = cookie # we keep that so can submit a stale later
|
old_cookie = cookie # we keep that so can submit a stale later
|
||||||
|
loop_time = time.time()
|
||||||
while True:
|
while True:
|
||||||
nonce += 1
|
nonce += 1
|
||||||
try:
|
try:
|
||||||
@ -218,6 +233,11 @@ class RPCPaymentTest():
|
|||||||
found_invalid += 1
|
found_invalid += 1
|
||||||
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
||||||
|
|
||||||
|
if time.time() >= loop_time + 10:
|
||||||
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
cookie = res.cookie
|
||||||
|
loop_time = time.time()
|
||||||
|
|
||||||
res = daemon.rpc_access_data()
|
res = daemon.rpc_access_data()
|
||||||
assert len(res.entries) > 0
|
assert len(res.entries) > 0
|
||||||
e = [x for x in res.entries if x['client'] == self.public_key]
|
e = [x for x in res.entries if x['client'] == self.public_key]
|
||||||
@ -247,14 +267,17 @@ class RPCPaymentTest():
|
|||||||
|
|
||||||
# find stales without updating cookie, one within 5 seconds (accepted), one later (rejected)
|
# find stales without updating cookie, one within 5 seconds (accepted), one later (rejected)
|
||||||
res = daemon.rpc_access_info(client = self.get_signature())
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
cookie = res.cookie # let the daemon update its timestamp, but use old cookie
|
||||||
found_close_stale = 0
|
found_close_stale = 0
|
||||||
found_late_stale = 0
|
found_late_stale = 0
|
||||||
|
loop_time = time.time()
|
||||||
while found_close_stale == 0 or found_late_stale == 0:
|
while found_close_stale == 0 or found_late_stale == 0:
|
||||||
nonce += 1
|
nonce += 1
|
||||||
try:
|
try:
|
||||||
res = daemon.rpc_access_submit_nonce(nonce = nonce, cookie = cookie, client = self.get_signature())
|
res = daemon.rpc_access_submit_nonce(nonce = nonce, cookie = cookie, client = self.get_signature())
|
||||||
found_close_stale += 1
|
found_close_stale += 1
|
||||||
found_valid += 1
|
found_valid += 1
|
||||||
|
time.sleep(15) # now we've got an early stale, wait till they become late stales
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
#if e[0]['error']['code'] == -18: # stale
|
#if e[0]['error']['code'] == -18: # stale
|
||||||
if "'code': -18" in str(e): # stale (ugly version, but also works with python 3)
|
if "'code': -18" in str(e): # stale (ugly version, but also works with python 3)
|
||||||
@ -263,6 +286,11 @@ class RPCPaymentTest():
|
|||||||
found_invalid += 1
|
found_invalid += 1
|
||||||
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
assert nonce < 1000 # can't find both valid and invalid -> the RPC probably fails
|
||||||
|
|
||||||
|
if time.time() >= loop_time + 10:
|
||||||
|
res = daemon.rpc_access_info(client = self.get_signature())
|
||||||
|
# cookie = res.cookie # let the daemon update its timestamp, but use old cookie
|
||||||
|
loop_time = time.time()
|
||||||
|
|
||||||
res = daemon.rpc_access_data()
|
res = daemon.rpc_access_data()
|
||||||
assert len(res.entries) > 0
|
assert len(res.entries) > 0
|
||||||
e = [x for x in res.entries if x['client'] == self.public_key]
|
e = [x for x in res.entries if x['client'] == self.public_key]
|
||||||
|
Loading…
Reference in New Issue
Block a user