aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/test_framework
diff options
context:
space:
mode:
authorwhythat <yuri.zhykin@gmail.com>2016-07-25 01:30:28 +0300
committerwhythat <yuri.zhykin@gmail.com>2016-07-25 01:30:28 +0300
commit0ff4375c93bd159233282de5a33ad2e6c1e79841 (patch)
treee605a5671343d3ffe0201b0d4fc50d26bd6c2821 /qa/rpc-tests/test_framework
parent0df9ea42b888b0b5c0fa5866f012338c8f16374c (diff)
[qa]: add parsing for '<host>:<port>' argument form to rpc_url()
Diffstat (limited to 'qa/rpc-tests/test_framework')
-rw-r--r--qa/rpc-tests/test_framework/util.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 32fe79efc3..8aa34265c5 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -171,7 +171,15 @@ def rpc_auth_pair(n):
def rpc_url(i, rpchost=None):
rpc_u, rpc_p = rpc_auth_pair(i)
- return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, rpchost or '127.0.0.1', rpc_port(i))
+ host = '127.0.0.1'
+ port = rpc_port(i)
+ if rpchost:
+ parts = rpchost.split(':')
+ if len(parts) == 2:
+ host, port = parts
+ else:
+ host = rpchost
+ return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port))
def wait_for_bitcoind_start(process, url, i):
'''