diff options
| author | John Newbery <john@johnnewbery.com> | 2017-06-09 16:35:17 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-10-03 18:43:15 +0200 |
| commit | 4d3ba18386c7a09086d06c8b640c19343ff34188 (patch) | |
| tree | 93de2e0a806af1d76f8b36faf1bf3f3a5677a684 /test/functional/multiwallet.py | |
| parent | 11a5992c90d4cc9a3823ea08dab2c078bcbf15d2 (diff) | |
| download | bitcoin-4d3ba18386c7a09086d06c8b640c19343ff34188.tar.xz | |
[tests] TestNode: separate add_node from start_node
Separates the act of creating a TestNode object from starting the node.
The test_framework now keeps track of its list of TestNodes, and test
writers can call start_node() and stop_node() without having to update
the self.nodes list.
Github-Pull: #11121
Rebased-From: 36b626867087e9fae6d85f926248997ebff327b7
Diffstat (limited to 'test/functional/multiwallet.py')
| -rwxr-xr-x | test/functional/multiwallet.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py index fc6e8e325f..7381a9fd54 100755 --- a/test/functional/multiwallet.py +++ b/test/functional/multiwallet.py @@ -23,17 +23,17 @@ class MultiWalletTest(BitcoinTestFramework): self.stop_node(0) # should not initialize if there are duplicate wallets - self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.') + self.assert_start_raises_init_error(0, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.') # should not initialize if wallet file is a directory os.mkdir(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w11')) - self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.') + self.assert_start_raises_init_error(0, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.') # should not initialize if wallet file is a symlink os.symlink(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w1'), os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w12')) - self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.') + self.assert_start_raises_init_error(0, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.') - self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args[0]) + self.start_node(0, self.extra_args[0]) w1 = self.nodes[0].get_wallet_rpc("w1") w2 = self.nodes[0].get_wallet_rpc("w2") |