mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-13 03:30:42 +02:00
Merge 15155 via test_external_bcli
This commit is contained in:
commit
7d6366b565
@ -980,8 +980,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||
raise SkipTest("bitcoin-util has not been compiled")
|
||||
|
||||
def skip_if_no_cli(self):
|
||||
"""Skip the running test if bitcoin-cli has not been compiled."""
|
||||
if not self.is_cli_compiled():
|
||||
"""Skip the running test if bitcoin-cli is not available."""
|
||||
if not self.is_cli_available():
|
||||
raise SkipTest("bitcoin-cli has not been compiled.")
|
||||
|
||||
def skip_if_no_previous_releases(self):
|
||||
@ -1002,8 +1002,11 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||
if not self.is_external_signer_compiled():
|
||||
raise SkipTest("external signer support has not been compiled.")
|
||||
|
||||
def is_cli_compiled(self):
|
||||
"""Checks whether bitcoin-cli was compiled."""
|
||||
def is_cli_available(self):
|
||||
"""Checks whether bitcoin-cli is available."""
|
||||
if "BITCOINCLI" in os.environ:
|
||||
return os.environ["BITCOINCLI"]
|
||||
|
||||
return self.config["components"].getboolean("ENABLE_CLI")
|
||||
|
||||
def is_external_signer_compiled(self):
|
||||
|
Loading…
Reference in New Issue
Block a user