aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-10-25 20:43:27 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-10-25 20:43:27 -0500
commit0aec2613f217725dece5623ea657b10a8676a5a4 (patch)
tree5c96d633cbb5ee8acb1e7ec94b00bd89cae39b1f
parentMerge pull request #6024 (diff)
parentfunctional_tests: fix rpc_payment tests with python 3 (diff)
downloadmonero-0aec2613f217725dece5623ea657b10a8676a5a4.tar.xz
Merge pull request #6032
978a61f functional_tests: fix rpc_payment tests with python 3 (moneromooo-monero)
-rwxr-xr-xtests/functional_tests/rpc_payment.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/functional_tests/rpc_payment.py b/tests/functional_tests/rpc_payment.py
index fa72f547a..4c777ccd7 100755
--- a/tests/functional_tests/rpc_payment.py
+++ b/tests/functional_tests/rpc_payment.py
@@ -51,13 +51,13 @@ class RPCPaymentTest():
self.test_free_access()
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()
assert len(fields) == 2
return fields
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):
print('Resetting blockchain')
@@ -256,7 +256,8 @@ class RPCPaymentTest():
found_close_stale += 1
found_valid += 1
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
else:
found_invalid += 1