aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-06-29 15:06:33 +0100
committerJohn Newbery <john@johnnewbery.com>2017-06-29 15:06:38 +0100
commit5ba83c1d434be508064cf039d73f215f0b199c2d (patch)
tree5e2f5010a38d7db088651eb4cae797c874fa4a76 /test
parent05b8c081b435e87b08335e9f9b62a55fa1d48ecc (diff)
downloadbitcoin-5ba83c1d434be508064cf039d73f215f0b199c2d.tar.xz
[tests] fix nits.
Thanks to Marco Falke.
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/test_framework/test_framework.py2
-rw-r--r--test/functional/test_framework/util.py3
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 00807b022c..8d698a7327 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 8080c8c972..3c918b48fb 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'