sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tests] fix nits.

Browse Source 
Thanks to Marco Falke.
This commit is contained in:
John Newbery 2017-06-29 15:06:33 +01:00
parent 05b8c081b4
commit 5ba83c1d43
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test_framework/test_framework.py
View File

@ -255,8 +255,8 @@ class BitcoinTestFramework(object):
except http.client.CannotSendRequest as e: except http.client.CannotSendRequest as e:
self.log.exception("Unable to stop node") self.log.exception("Unable to stop node")
return_code = self.bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT) return_code = self.bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
assert_equal(return_code, 0)
del self.bitcoind_processes[i] del self.bitcoind_processes[i]
assert_equal(return_code, 0)
def stop_nodes(self): def stop_nodes(self):
"""Stop multiple bitcoind test nodes""" """Stop multiple bitcoind test nodes"""

3
test/functional/test_framework/util.py
View File

@ -203,9 +203,6 @@ def p2p_port(n):
def rpc_port(n): def rpc_port(n):
return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES) return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
def rpc_auth_pair(n):
return 'rpcuser💻' + str(n), 'rpcpass🔑' + str(n)
def rpc_url(datadir, i, rpchost=None): def rpc_url(datadir, i, rpchost=None):
rpc_u, rpc_p = get_auth_cookie(datadir, i) rpc_u, rpc_p = get_auth_cookie(datadir, i)
host = '127.0.0.1' host = '127.0.0.1'