From 0ff4375c93bd159233282de5a33ad2e6c1e79841 Mon Sep 17 00:00:00 2001
From: whythat <yuri.zhykin@gmail.com>
Date: Mon, 25 Jul 2016 01:30:28 +0300
Subject: [PATCH] [qa]: add parsing for '<host>:<port>' argument form to
rpc_url()
---
qa/rpc-tests/test_framework/util.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 32fe79efc..8aa34265c 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):
'''