Merge 15155 via test_external_bcli

bitcoinknots · Jun 21, 2024 · 37442ac · 37442ac
2 parents 2dc1722 + 06ec7f5
commit 37442ac
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -954,8 +954,8 @@ def skip_if_no_bitcoin_util(self):
             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):
@@ -976,8 +976,11 @@ def skip_if_no_external_signer(self):
         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):