Skip to content

Commit ec20f01

Browse files
committed
Merge #11215: [tests] fixups from set_test_params()
3918d93 [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
2 parents 28f788e + 3918d93 commit ec20f01

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

test/functional/bitcoin_cli.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
class TestBitcoinCli(BitcoinTestFramework):
1010

11-
def __init__(self):
12-
super().__init__()
11+
def set_test_params(self):
1312
self.setup_clean_chain = True
1413
self.num_nodes = 1
1514

test/functional/example_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def set_test_params(self):
8585
# Use self.extra_args to change command-line arguments for the nodes
8686
self.extra_args = [[], ["-logips"], []]
8787

88-
# self.log.info("I've finished __init__") # Oops! Can't run self.log before run_test()
88+
# self.log.info("I've finished set_test_params") # Oops! Can't run self.log before run_test()
8989

9090
# Use add_options() to add specific command-line options for your test.
9191
# In practice this is not used very much, since the tests are mostly written

0 commit comments

Comments
 (0)