diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-02-22 11:29:43 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-02-23 03:05:43 +0100 |
commit | fa4cd2e998e0ebebe283a6243f7f752123a105ab (patch) | |
tree | 691fa6bf7ffa07cc0676bba2d5fe21ae6854e08f /qa/rpc-tests/rpcbind_test.py | |
parent | 8ad31f9aa3111e079dd5024e8f6b069abb564b81 (diff) | |
download | bitcoin-fa4cd2e998e0ebebe283a6243f7f752123a105ab.tar.xz |
qa: Check return code when stopping nodes
This includes work by jnewbery
Diffstat (limited to 'qa/rpc-tests/rpcbind_test.py')
-rwxr-xr-x | qa/rpc-tests/rpcbind_test.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py index d78d0b884e..1010c54aa5 100755 --- a/qa/rpc-tests/rpcbind_test.py +++ b/qa/rpc-tests/rpcbind_test.py @@ -35,11 +35,9 @@ class RPCBindTest(BitcoinTestFramework): base_args += ['-rpcallowip=' + x for x in allow_ips] binds = ['-rpcbind='+addr for addr in addresses] self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args + binds], connect_to) - try: - pid = bitcoind_processes[0].pid - assert_equal(set(get_bind_addrs(pid)), set(expected)) - finally: - stop_nodes(self.nodes) + pid = bitcoind_processes[0].pid + assert_equal(set(get_bind_addrs(pid)), set(expected)) + stop_nodes(self.nodes) def run_allowip_test(self, allow_ips, rpchost, rpcport): ''' @@ -48,13 +46,10 @@ class RPCBindTest(BitcoinTestFramework): ''' base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips] self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args]) - try: - # connect to node through non-loopback interface - node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0) - node.getnetworkinfo() - finally: - node = None # make sure connection will be garbage collected and closed - stop_nodes(self.nodes) + # connect to node through non-loopback interface + node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0) + node.getnetworkinfo() + stop_nodes(self.nodes) def run_test(self): # due to OS-specific network stats queries, this test works only on Linux |