aboutsummaryrefslogtreecommitdiff
path: root/test/functional/feature_filelock.py
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2020-09-28 20:24:06 -0400
committerRussell Yanofsky <russ@yanofsky.org>2020-09-29 04:35:01 -0400
commitc1585bca8dae01dee6a1dd8eadae2f8b100503df (patch)
treed361e4c330412af6f2a6356787da4030c5553e51 /test/functional/feature_filelock.py
parented3acda33b75d1b546ee696a63def239bcdd62de (diff)
downloadbitcoin-c1585bca8dae01dee6a1dd8eadae2f8b100503df.tar.xz
test: Get rid of default wallet hacks
- Get rid of hardcoded wallet "" names and -wallet="" args - Get rid of setup_nodes (-wallet, -nowallet, -disablewallet) argument rewriting Motivation: - Simplify test framework behavior so it's easier to write new tests without having arguments mangled by the framework - Make tests more readable, replacing unexplained "" string literals with default_wallet_name references - Make it trivial to update default wallet name and wallet data filename for sqlite #19077 testing - Stop relying on -wallet arguments to create wallets, so it is easy to change -wallet option in the future to only load existing wallets not create new ones (to avoid accidental wallet creation, and encourage use of wallet encryption and descriptor features)
Diffstat (limited to 'test/functional/feature_filelock.py')
-rwxr-xr-xtest/functional/feature_filelock.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py
index 6a8c97d001..7de9a589be 100755
--- a/test/functional/feature_filelock.py
+++ b/test/functional/feature_filelock.py
@@ -15,7 +15,7 @@ class FilelockTest(BitcoinTestFramework):
def setup_network(self):
self.add_nodes(self.num_nodes, extra_args=None)
- self.nodes[0].start(['-wallet='])
+ self.nodes[0].start()
self.nodes[0].wait_for_rpc_connection()
def run_test(self):
@@ -27,6 +27,7 @@ class FilelockTest(BitcoinTestFramework):
self.nodes[1].assert_start_raises_init_error(extra_args=['-datadir={}'.format(self.nodes[0].datadir), '-noserver'], expected_msg=expected_msg)
if self.is_wallet_compiled():
+ self.nodes[0].createwallet(self.default_wallet_name)
wallet_dir = os.path.join(datadir, 'wallets')
self.log.info("Check that we can't start a second bitcoind instance using the same wallet")
expected_msg = "Error: Error initializing wallet database environment"