mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-found-dexdump' into 'master'

Browse source 
fix _dexdump_found() in test_scanner.py !1621

See merge request fdroid/fdroidserver!1625
This commit is contained in:
Hans-Christoph Steiner 2025-03-24 08:24:46 +00:00
commit 51487192b9
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_scanner.py
View file

@ -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.