Merge #11121: TestNode tidyups
commit28f788e47e58f2b462351d6989348a4e1a241b2b
authorMarcoFalke <falke.marco@gmail.com>
Fri, 1 Sep 2017 16:47:13 +0000 (1 18:47 +0200)
committerMarcoFalke <falke.marco@gmail.com>
Fri, 1 Sep 2017 16:47:26 +0000 (1 18:47 +0200)
tree7ee3af973d7753296aebc90f061e4ddc0eef50cb
parentd81dccf191a48a6b59c3747d7b4ccbe3535dde40
parent7148b74dc39110f53c665b94fa9d994c6ad6dc1c
Merge #11121: TestNode tidyups

7148b74dc [tests] Functional tests must explicitly set num_nodes (John Newbery)
5448a1471 [tests] don't override __init__() in individual tests (John Newbery)
6cf094a02 [tests] Avoid passing around member variables in test_framework (John Newbery)
36b626867 [tests] TestNode: separate add_node from start_node (John Newbery)
be2a2ab6a [tests] fix - use rpc_timeout as rpc timeout (John Newbery)

Pull request description:

  Some additional tidyups after the introduction of TestNode:

  - commit 1 makes TestNode use the correct rpc timeout. This should have been included in #11077
  - commit 2 separates `add_node()` from `start_node()` as originally discussed here: https://github.com/bitcoin/bitcoin/pull/10556#discussion_r121161453 with @kallewoof . The test writer no longer needs to assign to `self.nodes` when starting/stopping nodes.
  - commit 3 adds a `set_test_params()` method, so individual tests don't need to override `__init__()` and call `super().__init__()`

Tree-SHA512: 0adb030623b96675b5c29e2890ce99ccd837ed05f721d0c91b35378c5ac01b6658174aac12f1f77402e1d38b61f39b3c43b4df85c96952565dde1cda05b0db84
18 files changed:
test/functional/bip68-sequence.py
test/functional/bumpfee.py
test/functional/fundrawtransaction.py
test/functional/import-rescan.py
test/functional/importmulti.py
test/functional/importprunedfunds.py
test/functional/mempool_packages.py
test/functional/mining.py
test/functional/p2p-compactblocks.py
test/functional/p2p-fullblocktest.py
test/functional/p2p-segwit.py
test/functional/preciousblock.py
test/functional/rawtransactions.py
test/functional/replace-by-fee.py
test/functional/segwit.py
test/functional/test_framework/test_node.py
test/functional/wallet-dump.py
test/functional/wallet.py