Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-22 10:02:34 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 15155 via test_external_bcli

Browse Source
This commit is contained in:
Luke Dashjr 2025-03-05 03:27:08 +00:00
commit 7d6366b565
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/functional/test_framework/test_framework.py
View File

@ -980,8 +980,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
raise SkipTest("bitcoin-util has not been compiled") raise SkipTest("bitcoin-util has not been compiled")
def skip_if_no_cli(self): def skip_if_no_cli(self):
"""Skip the running test if bitcoin-cli has not been compiled.""" """Skip the running test if bitcoin-cli is not available."""
if not self.is_cli_compiled(): if not self.is_cli_available():
raise SkipTest("bitcoin-cli has not been compiled.") raise SkipTest("bitcoin-cli has not been compiled.")
def skip_if_no_previous_releases(self): def skip_if_no_previous_releases(self):
@ -1002,8 +1002,11 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
if not self.is_external_signer_compiled(): if not self.is_external_signer_compiled():
raise SkipTest("external signer support has not been compiled.") raise SkipTest("external signer support has not been compiled.")
def is_cli_compiled(self): def is_cli_available(self):
"""Checks whether bitcoin-cli was compiled.""" """Checks whether bitcoin-cli is available."""
if "BITCOINCLI" in os.environ:
return os.environ["BITCOINCLI"]
return self.config["components"].getboolean("ENABLE_CLI") return self.config["components"].getboolean("ENABLE_CLI")
def is_external_signer_compiled(self): def is_external_signer_compiled(self):