mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'missing_aapt' into 'master'
Fix tests See merge request fdroid/fdroidserver!831
This commit is contained in:
commit
7f1aef0105
@ -604,6 +604,7 @@ include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
|
||||
include tests/metadata/souch.smsbypass.yml
|
||||
include tests/metadata.TestCase
|
||||
include tests/minimal_targetsdk_30_unsigned.apk
|
||||
include tests/no_targetsdk_minsdk1_unsigned.apk
|
||||
include tests/openssl-version-check-test.py
|
||||
include tests/org.bitbucket.tickytacky.mirrormirror_1.apk
|
||||
include tests/org.bitbucket.tickytacky.mirrormirror_2.apk
|
||||
@ -675,6 +676,7 @@ include tests/signindex/guardianproject-v1.jar
|
||||
include tests/signindex/testy.jar
|
||||
include tests/signindex/unsigned.jar
|
||||
include tests/source-files/at.bitfire.davdroid/build.gradle
|
||||
include tests/source-files/cn.wildfirechat.chat
|
||||
include tests/source-files/com.kunzisoft.testcase/build.gradle
|
||||
include tests/source-files/com.nextcloud.client/build.gradle
|
||||
include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt
|
||||
|
@ -480,7 +480,7 @@ def find_apksigner():
|
||||
if not os.path.isdir(build_tools_path):
|
||||
return None
|
||||
for f in sorted(os.listdir(build_tools_path), reverse=True):
|
||||
if not os.path.isdir(os.path.join(build_tools_path, f)):
|
||||
if not os.path.isdir(os.path.join(build_tools_path, f)) or not isinstance(LooseVersion(f), int):
|
||||
continue
|
||||
if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
|
||||
return None
|
||||
|
@ -715,10 +715,9 @@ class CommonTest(unittest.TestCase):
|
||||
fdroidserver.common.fill_config_defaults(config)
|
||||
fdroidserver.common.config = config
|
||||
self._set_build_tools()
|
||||
try:
|
||||
aapt = fdroidserver.common.find_sdk_tools_cmd('aapt')
|
||||
if aapt:
|
||||
config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
|
||||
except fdroidserver.exception.FDroidException:
|
||||
pass # aapt is not required if androguard is present
|
||||
|
||||
testcases = [
|
||||
('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'),
|
||||
|
Loading…
Reference in New Issue
Block a user