diff options
author | Andrew Chow <achow101-github@achow101.com> | 2017-06-06 11:43:24 -0700 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2017-06-08 17:19:39 -0700 |
commit | 3ec5ad88e67bba74c795575d52c97fd2c7e880c1 (patch) | |
tree | cee5030718555f704718a126fe0d5f3a24714a4c /test/functional/test_framework/util.py | |
parent | c53c9831eedaf3b311bb942945268830f9ba3abc (diff) | |
download | bitcoin-3ec5ad88e67bba74c795575d52c97fd2c7e880c1.tar.xz |
Add test for rpcuser/rpcpassword
Diffstat (limited to 'test/functional/test_framework/util.py')
-rw-r--r-- | test/functional/test_framework/util.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index e09e9b6afc..c94dd6499f 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -187,10 +187,10 @@ def initialize_datadir(dirname, n): f.write("rpcport="+str(rpc_port(n))+"\n") f.write("listenonion=0\n") return datadir - + def get_datadir_path(dirname, n): return os.path.join(dirname, "node"+str(n)) - + def get_auth_cookie(datadir, n): if os.path.isfile(os.path.join(datadir, "regtest", ".cookie")): with open(os.path.join(datadir, "regtest", ".cookie"), 'r') as f: @@ -224,7 +224,7 @@ def rpc_url(datadir, i, rpchost=None): host = rpchost return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port)) -def wait_for_bitcoind_start(process, datadir, i): +def wait_for_bitcoind_start(process, datadir, i, rpchost=None): ''' Wait for bitcoind to start. This means that RPC is accessible and fully initialized. Raise an exception if bitcoind exits during initialization. @@ -234,7 +234,7 @@ def wait_for_bitcoind_start(process, datadir, i): raise Exception('bitcoind exited with status %i during initialization' % process.returncode) try: # Check if .cookie file to be created - rpc = get_rpc_proxy(rpc_url(datadir, i), i) + rpc = get_rpc_proxy(rpc_url(datadir, i, rpchost), i) blocks = rpc.getblockcount() break # break out of loop on success except IOError as e: @@ -261,7 +261,7 @@ def _start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args, stderr=stderr) logger.debug("initialize_chain: bitcoind started, waiting for RPC to come up") - wait_for_bitcoind_start(bitcoind_processes[i], datadir, i) + wait_for_bitcoind_start(bitcoind_processes[i], datadir, i, rpchost) logger.debug("initialize_chain: RPC successfully started") proxy = get_rpc_proxy(rpc_url(datadir, i, rpchost), i, timeout=timewait) |