diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-06-02 12:08:48 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-06-02 12:10:41 +0200 |
commit | 329fc1dce7a1c372c8b10c2f2f8732b2c60daff0 (patch) | |
tree | 79a6fb944445bf77883bfb1c993d7c47b49a8305 /test/functional/rpcbind_test.py | |
parent | 1aefc94dd78d6e0c9209cb09fc16f53dedf42108 (diff) | |
parent | 53f6775fe14417a5b975a40b3c0964a9e86d5f39 (diff) | |
download | bitcoin-329fc1dce7a1c372c8b10c2f2f8732b2c60daff0.tar.xz |
Merge #10359: [tests] functional tests should call BitcoinTestFramework start/stop node methods
53f6775 fixup: fix nits (John Newbery)
a433d8a [tests] Update start/stop node functions to be private module functions (John Newbery)
d8c218f [tests] Functional tests call self.start_node(s) and self.stop_node(s) (John Newbery)
Tree-SHA512: 9cc01584a5e57686b7e7cb1c4c5186ad8cc7eb650d6d4f27b06bdb5e249a10966705814bdfb22d9ff2d5d3326911e489bf3d22257d751a299c0b24b7f40bffb5
Diffstat (limited to 'test/functional/rpcbind_test.py')
-rwxr-xr-x | test/functional/rpcbind_test.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/rpcbind_test.py b/test/functional/rpcbind_test.py index d8ab4e6f98..5336cf2ec8 100755 --- a/test/functional/rpcbind_test.py +++ b/test/functional/rpcbind_test.py @@ -36,10 +36,10 @@ class RPCBindTest(BitcoinTestFramework): if allow_ips: 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) + self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, [base_args + binds], connect_to) pid = bitcoind_processes[0].pid assert_equal(set(get_bind_addrs(pid)), set(expected)) - stop_nodes(self.nodes) + self.stop_nodes() def run_allowip_test(self, allow_ips, rpchost, rpcport): ''' @@ -47,11 +47,11 @@ class RPCBindTest(BitcoinTestFramework): at a non-localhost IP. ''' base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips] - self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args]) + self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, [base_args]) # 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) + self.stop_nodes() def run_test(self): # due to OS-specific network stats queries, this test works only on Linux |