diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-02-05 10:41:36 +0000 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-02-05 10:41:40 +0000 |
| commit | bd5c4c69716e4236d2959bd733a2170afbc715f6 (patch) | |
| tree | e94aa67f7c2bcd168811f49fb68127724c86ddeb /test | |
| parent | 554d89fb295efe5c8adc81583d5ded1acbd98305 (diff) | |
| parent | eca56f89293b74f11ca631ff2a0793e970e65841 (diff) | |
| download | bitcoin-bd5c4c69716e4236d2959bd733a2170afbc715f6.tar.xz | |
Merge #18069: test: replace 'regtest' leftovers by self.chain
eca56f89293b74f11ca631ff2a0793e970e65841 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
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/feature_config_args.py | 4 | ||||
| -rwxr-xr-x | test/functional/rpc_dumptxoutset.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 719b124a65..311d822a87 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -93,8 +93,8 @@ class ConfArgsTest(BitcoinTestFramework): 'Command-line arg: rpcpassword=****', 'Command-line arg: rpcuser=****', 'Command-line arg: torpassword=****', - 'Config file arg: regtest="1"', - 'Config file arg: [regtest] server="1"', + 'Config file arg: %s="1"' % self.chain, + 'Config file arg: [%s] server="1"' % self.chain, ], unexpected_msgs=[ 'alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc0', diff --git a/test/functional/rpc_dumptxoutset.py b/test/functional/rpc_dumptxoutset.py index 7527bdfb08..438e7f68e0 100755 --- a/test/functional/rpc_dumptxoutset.py +++ b/test/functional/rpc_dumptxoutset.py @@ -25,7 +25,7 @@ class DumptxoutsetTest(BitcoinTestFramework): FILENAME = 'txoutset.dat' out = node.dumptxoutset(FILENAME) - expected_path = Path(node.datadir) / 'regtest' / FILENAME + expected_path = Path(node.datadir) / self.chain / FILENAME assert expected_path.is_file() |