aboutsummaryrefslogtreecommitdiff
path: root/test/functional/wallet-encryption.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-06-02 13:14:14 -0400
committerJohn Newbery <john@johnnewbery.com>2017-06-29 11:55:19 +0100
commitcad967a892d836b3afbd1ab81c73731e968368c6 (patch)
tree2d14c93b35f492798fd89ac6481218c9d489a30b /test/functional/wallet-encryption.py
parentf1fe5368f191018a72276a93a9e74cd95f896697 (diff)
downloadbitcoin-cad967a892d836b3afbd1ab81c73731e968368c6.tar.xz
[tests] Move stop_node and start_node methods to BitcoinTestFramework
This commit moves functions start_node, start_nodes, stop_node and stop_nodes functions into the BitcoinTestFramework class. It also moves the bitcoind_processes dict and coverage variables into BitcoinTestFramework.
Diffstat (limited to 'test/functional/wallet-encryption.py')
-rwxr-xr-xtest/functional/wallet-encryption.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/functional/wallet-encryption.py b/test/functional/wallet-encryption.py
index 33872e3c94..ba72918fe1 100755
--- a/test/functional/wallet-encryption.py
+++ b/test/functional/wallet-encryption.py
@@ -6,12 +6,10 @@
import time
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BitcoinTestFramework, BITCOIND_PROC_WAIT_TIMEOUT
from test_framework.util import (
assert_equal,
assert_raises_jsonrpc,
- bitcoind_processes,
- BITCOIND_PROC_WAIT_TIMEOUT,
)
class WalletEncryptionTest(BitcoinTestFramework):
@@ -33,7 +31,7 @@ class WalletEncryptionTest(BitcoinTestFramework):
# Encrypt the wallet
self.nodes[0].encryptwallet(passphrase)
- bitcoind_processes[0].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
+ self.bitcoind_processes[0].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
self.nodes[0] = self.start_node(0, self.options.tmpdir)
# Test that the wallet is encrypted