aboutsummaryrefslogtreecommitdiff
path: root/test/functional/blockchain.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/blockchain.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/blockchain.py')
-rwxr-xr-xtest/functional/blockchain.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/blockchain.py b/test/functional/blockchain.py
index a7034e6bcd..0812e1b0df 100755
--- a/test/functional/blockchain.py
+++ b/test/functional/blockchain.py
@@ -139,13 +139,13 @@ class BlockchainTest(BitcoinTestFramework):
self.nodes[0].generate(6)
assert_equal(self.nodes[0].getblockcount(), 206)
self.log.debug('Node should not stop at this height')
- assert_raises(subprocess.TimeoutExpired, lambda: self.bitcoind_processes[0].wait(timeout=3))
+ assert_raises(subprocess.TimeoutExpired, lambda: self.nodes[0].process.wait(timeout=3))
try:
self.nodes[0].generate(1)
except (ConnectionError, http.client.BadStatusLine):
pass # The node already shut down before response
self.log.debug('Node should stop at this height...')
- self.bitcoind_processes[0].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
+ self.nodes[0].process.wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
self.nodes[0] = self.start_node(0, self.options.tmpdir)
assert_equal(self.nodes[0].getblockcount(), 207)