mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-11 17:57:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge #18069: test: replace 'regtest' leftovers by self.chain

Browse source 
eca56f8929 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
This commit is contained in:
MarcoFalke 2020-02-05 10:41:36 +00:00
commit bd5c4c6971
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/functional/feature_config_args.py
View file

@ -93,8 +93,8 @@ class ConfArgsTest(BitcoinTestFramework):
'Command-line arg: rpcpassword=****', 'Command-line arg: rpcpassword=****',
'Command-line arg: rpcuser=****', 'Command-line arg: rpcuser=****',
'Command-line arg: torpassword=****', 'Command-line arg: torpassword=****',
'Config file arg: regtest="1"', 'Config file arg: %s="1"' % self.chain,
'Config file arg: [regtest] server="1"', 'Config file arg: [%s] server="1"' % self.chain,
], ],
unexpected_msgs=[ unexpected_msgs=[
'alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc0', 'alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc0',

2
test/functional/rpc_dumptxoutset.py
View file

@ -25,7 +25,7 @@ class DumptxoutsetTest(BitcoinTestFramework):
FILENAME = 'txoutset.dat' FILENAME = 'txoutset.dat'
out = node.dumptxoutset(FILENAME) out = node.dumptxoutset(FILENAME)
expected_path = Path(node.datadir) / 'regtest' / FILENAME expected_path = Path(node.datadir) / self.chain / FILENAME
assert expected_path.is_file() assert expected_path.is_file()