diff options
| author | Andrew Chow <github@achow101.com> | 2023-12-01 12:18:09 -0500 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-12-01 12:24:29 -0500 |
| commit | 18bed148af65746dd3a0066fefc5b48f9729c1b6 (patch) | |
| tree | 194f00bb5d20458a06f3f36f57537232519edee3 /test/functional | |
| parent | 6b3927f79a92a737f32ab32e96c681462da923ef (diff) | |
| parent | 7cb9367157eb42ee06bc6fa024522cc14a80138d (diff) | |
Merge bitcoin/bitcoin#28784: rpc: keep `.cookie` file if it was not generated
7cb9367157eb42ee06bc6fa024522cc14a80138d rpc: keep .cookie if it was not generated (Roman Zeyde)
Pull request description:
Otherwise, starting bitcoind twice may cause the `.cookie` file generated by the first instance to be deleted by the second instance shutdown (after failing to obtain a lock).
ACKs for top commit:
willcl-ark:
re-ACK 7cb9367157eb42ee06bc6fa024522cc14a80138d
achow101:
ACK 7cb9367157eb42ee06bc6fa024522cc14a80138d
kristapsk:
re-ACK 7cb9367157eb42ee06bc6fa024522cc14a80138d
stickies-v:
ACK 7cb9367157eb42ee06bc6fa024522cc14a80138d
Tree-SHA512: 0960dbc457975b0e0535f3d814824a879d7f85c9f1191537415b3fc253429a316a8e4badde56c8bc139778f132392983cec5fbe03891fb15ff61d3bc3f6e681b
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/feature_filelock.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py index 24a68a04bf..0f4be54d0e 100755 --- a/test/functional/feature_filelock.py +++ b/test/functional/feature_filelock.py @@ -30,6 +30,9 @@ class FilelockTest(BitcoinTestFramework): 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_path}', '-noserver'], expected_msg=expected_msg) + cookie_file = datadir / ".cookie" + assert cookie_file.exists() # should not be deleted during the second bitcoind instance shutdown + if self.is_wallet_compiled(): def check_wallet_filelock(descriptors): wallet_name = ''.join([random.choice(string.ascii_lowercase) for _ in range(6)]) |