diff options
| author | fanquake <fanquake@gmail.com> | 2023-10-11 20:06:26 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-10-11 20:06:36 +0200 |
| commit | d98d88c779bc28794e5936d5ad08fd2df3d992a4 (patch) | |
| tree | 26db234b00fbde69a8562aae1de11a904319535d /test/functional/feature_filelock.py | |
| parent | 744157ef1a0b61ceb714cc27c9ae158907aecdc9 (diff) | |
| parent | bfa0bd632a7ce5d04005e20cba79abb32aec8da8 (diff) | |
Merge bitcoin/bitcoin#28392: test: Use pathlib over os path
bfa0bd632a7ce5d04005e20cba79abb32aec8da8 test: Use pathlib over os.path #28362 (ns-xvrn)
Pull request description:
In reference to issue #28362 refactoring of functional tests to use pathlib over os.path to reduce verbosity and increase the intuitiveness of managing file access.
ACKs for top commit:
maflcko:
re-ACK bfa0bd632a7ce5d04005e20cba79abb32aec8da8 🐨
willcl-ark:
ACK bfa0bd632a7ce5d04005e20cba79abb32aec8da8
Tree-SHA512: fb0833c4039d09758796514e47567a93ac831cb0776ff1a7ed8299792ad132e83282ef80bea098a88ae1551d906f2a56093d3e8de240412f9080735d00d496d9
Diffstat (limited to 'test/functional/feature_filelock.py')
| -rwxr-xr-x | test/functional/feature_filelock.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py index cf2f21d553..24a68a04bf 100755 --- a/test/functional/feature_filelock.py +++ b/test/functional/feature_filelock.py @@ -28,7 +28,7 @@ class FilelockTest(BitcoinTestFramework): self.log.info("Check that we can't start a second bitcoind instance using the same datadir") expected_msg = f"Error: Cannot obtain a lock on data directory {datadir}. {self.config['environment']['PACKAGE_NAME']} is probably already running." - self.nodes[1].assert_start_raises_init_error(extra_args=[f'-datadir={self.nodes[0].datadir}', '-noserver'], expected_msg=expected_msg) + self.nodes[1].assert_start_raises_init_error(extra_args=[f'-datadir={self.nodes[0].datadir_path}', '-noserver'], expected_msg=expected_msg) if self.is_wallet_compiled(): def check_wallet_filelock(descriptors): |