Merge #11215: [tests] fixups from set_test_params()

3918d93f3 [tests] fixups from set_test_params() (John Newbery)

Pull request description:

  #11121 had a silent merge conflict in `bitcoin_cli.py`. This fixes it.

  Also fixes a comment in `example_test.py`

Tree-SHA512: f22a645c51c9aeda005526338ad6f2ee07f2bab172847fc54f51fecf1c79e778970be61e5e637d4e0aba3a02e5aba0737b0b57f1bc11a514a1acd94c221b54d6
This commit is contained in:
Pieter Wuille 2017-09-01 15:44:05 -07:00 committed by Alexander Block
parent a304d4d47c
commit b9ce8480df
2 changed files with 2 additions and 3 deletions

View File

@ -8,8 +8,7 @@ from test_framework.util import assert_equal
class TestBitcoinCli(BitcoinTestFramework):
def __init__(self):
super().__init__()
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1

View File

@ -85,7 +85,7 @@ class ExampleTest(BitcoinTestFramework):
# Use self.extra_args to change command-line arguments for the nodes
self.extra_args = [[], ["-logips"], []]
# self.log.info("I've finished __init__") # Oops! Can't run self.log before run_test()
# self.log.info("I've finished set_test_params") # Oops! Can't run self.log before run_test()
# Use add_options() to add specific command-line options for your test.
# In practice this is not used very much, since the tests are mostly written