Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 06:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6032

Browse Source 
978a61f functional_tests: fix rpc_payment tests with python 3 (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-25 20:43:27 -05:00
commit 0aec2613f2
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/functional_tests/rpc_payment.py
View File

@ -51,13 +51,13 @@ class RPCPaymentTest():
self.test_free_access() self.test_free_access()
def get_keys(self): def get_keys(self):
output = subprocess.check_output([self.make_test_signature]).rstrip() output = subprocess.check_output([self.make_test_signature]).decode('utf-8').rstrip()
fields = output.split() fields = output.split()
assert len(fields) == 2 assert len(fields) == 2
return fields return fields
def get_signature(self): def get_signature(self):
return subprocess.check_output([self.make_test_signature, self.secret_key]).rstrip() return subprocess.check_output([self.make_test_signature, self.secret_key]).decode('utf-8').rstrip()
def reset(self): def reset(self):
print('Resetting blockchain') print('Resetting blockchain')
@ -256,7 +256,8 @@ class RPCPaymentTest():
found_close_stale += 1 found_close_stale += 1
found_valid += 1 found_valid += 1
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)
found_late_stale += 1 found_late_stale += 1
else: else:
found_invalid += 1 found_invalid += 1