aboutsummaryrefslogtreecommitdiff
path: root/test/functional/keypool.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-06-02 14:30:36 -0400
committerJohn Newbery <john@johnnewbery.com>2017-08-15 13:12:15 -0400
commit7897338918dac072e788b8ab2919d4559f311bef (patch)
treee514317914448eaf783a2b5b980ba9339895bbdb /test/functional/keypool.py
parente526ca6284b9e13be1b912b80dd73a34e739b539 (diff)
downloadbitcoin-7897338918dac072e788b8ab2919d4559f311bef.tar.xz
[tests] Introduce TestNode
TestNode is a class responsible for all state related to a bitcoind node under test. It stores local state, is responsible for tracking the bitcoind process and delegates unrecognised messages to the RPC connection. This commit changes start_nodes and stop_nodes to start and stop the bitcoind nodes in parallel, making test setup and teardown much faster.
Diffstat (limited to 'test/functional/keypool.py')
-rwxr-xr-xtest/functional/keypool.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/functional/keypool.py b/test/functional/keypool.py
index e8be559918..3e7bb0ee07 100755
--- a/test/functional/keypool.py
+++ b/test/functional/keypool.py
@@ -17,8 +17,7 @@ class KeyPoolTest(BitcoinTestFramework):
assert(addr_before_encrypting_data['hdmasterkeyid'] == wallet_info_old['hdmasterkeyid'])
# Encrypt wallet and wait to terminate
- nodes[0].encryptwallet('test')
- self.bitcoind_processes[0].wait()
+ nodes[0].node_encrypt_wallet('test')
# Restart node 0
nodes[0] = self.start_node(0, self.options.tmpdir)
# Keep creating keys