Skip to content

Commit bd5c4c6

Browse files
author
MarcoFalke
committed
Merge #18069: test: replace 'regtest' leftovers by self.chain
eca56f8 test: replace 'regtest' leftovers by self.chain (Sebastian Falbesoner) Pull request description: This is a follow-up PR to #16681 (fixes #18068), replacing all remaining hardcoded `"regtest"` strings in functional tests by `self.chain`. Top commit has no ACKs. Tree-SHA512: 96524649b33164938e5a95215991103ed7855ebab55ef788d4816b3fa5cbc03d8f3b0d39f2247a87522f289fd7f4daf25e059900b8462b5127eb154bbee89054
2 parents 554d89f + eca56f8 commit bd5c4c6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/functional/feature_config_args.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def test_args_log(self):
9393
'Command-line arg: rpcpassword=****',
9494
'Command-line arg: rpcuser=****',
9595
'Command-line arg: torpassword=****',
96-
'Config file arg: regtest="1"',
97-
'Config file arg: [regtest] server="1"',
96+
'Config file arg: %s="1"' % self.chain,
97+
'Config file arg: [%s] server="1"' % self.chain,
9898
],
9999
unexpected_msgs=[
100100
'alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc0',

test/functional/rpc_dumptxoutset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def run_test(self):
2525

2626
FILENAME = 'txoutset.dat'
2727
out = node.dumptxoutset(FILENAME)
28-
expected_path = Path(node.datadir) / 'regtest' / FILENAME
28+
expected_path = Path(node.datadir) / self.chain / FILENAME
2929

3030
assert expected_path.is_file()
3131

0 commit comments

Comments
 (0)