From eca56f89293b74f11ca631ff2a0793e970e65841 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Wed, 5 Feb 2020 04:18:57 +0100 Subject: [PATCH] test: replace 'regtest' leftovers by self.chain Commit 1abcecc40c518a98b7d17880657ec0247abdf125 replaced 'regtest' by self.chain 'regtest' "in almost all current tests", this commit takes care of the remaining ones. --- test/functional/feature_config_args.py | 4 ++-- 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 719b124a651..311d822a87b 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 7527bdfb08f..438e7f68e0b 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()