diff options
| author | John Newbery <[email protected]> | 2017-06-29 15:06:33 +0100 |
|---|---|---|
| committer | John Newbery <[email protected]> | 2017-06-29 15:06:38 +0100 |
| commit | 5ba83c1d434be508064cf039d73f215f0b199c2d (patch) | |
| tree | 5e2f5010a38d7db088651eb4cae797c874fa4a76 | |
| parent | [tests] reorganize utils.py module (code move only) (diff) | |
| download | discoin-5ba83c1d434be508064cf039d73f215f0b199c2d.tar.xz discoin-5ba83c1d434be508064cf039d73f215f0b199c2d.zip | |
[tests] fix nits.
Thanks to Marco Falke.
| -rwxr-xr-x | test/functional/test_framework/test_framework.py | 2 | ||||
| -rw-r--r-- | test/functional/test_framework/util.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 00807b022..8d698a732 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -255,8 +255,8 @@ class BitcoinTestFramework(object): except http.client.CannotSendRequest as e: self.log.exception("Unable to stop node") return_code = self.bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT) - assert_equal(return_code, 0) del self.bitcoind_processes[i] + assert_equal(return_code, 0) def stop_nodes(self): """Stop multiple bitcoind test nodes""" diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 8080c8c97..3c918b48f 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -203,9 +203,6 @@ def p2p_port(n): def rpc_port(n): 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): rpc_u, rpc_p = get_auth_cookie(datadir, i) host = '127.0.0.1' |