From 58609aa9f040b1975aa602f3a545194496ecb98f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Mar 2025 10:32:08 +0100
Subject: [PATCH] fix _dexdump_found() in test_scanner.py !1621

find_sdk_tools_cmd() will throw an exception if it can't find the tool, not
return None.
---
 tests/test_scanner.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/test_scanner.py b/tests/test_scanner.py
index 294ff8b7..1dbe15b0 100755
--- a/tests/test_scanner.py
+++ b/tests/test_scanner.py
@@ -23,6 +23,7 @@ import yaml
 
 import fdroidserver.build
 import fdroidserver.common
+import fdroidserver.exception
 import fdroidserver.metadata
 import fdroidserver.scanner
 from .shared_test_code import TmpCwd, mkdtemp, mock_open_to_str
@@ -36,9 +37,13 @@ def _dexdump_found():
     This must be run after common.config is setup.
 
     """
-    dexdump = fdroidserver.common.find_sdk_tools_cmd("dexdump")
-    logging.debug('Found dexdump: %s', dexdump)
-    return dexdump is not None
+    try:
+        dexdump = fdroidserver.common.find_sdk_tools_cmd("dexdump")
+        logging.debug('Found dexdump: %s', dexdump)
+        return dexdump is not None
+    except fdroidserver.exception.FDroidException:
+        pass
+    return False
 
 
 # Always use built-in default rules so changes in downloaded rules don't break tests.