From 66414a9fc7096cc6f4a3b5e305400741d05f8df1 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 26 Nov 2020 22:52:52 +0100 Subject: [PATCH 1/3] find_sdk_tools_cmd returns non if aapt is not found --- tests/common.TestCase | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index eff088d6..fc968c0f 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -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'), From 60748acb9d39098fb52638bb67cbb9a35a11840e Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 26 Nov 2020 23:13:30 +0100 Subject: [PATCH 2/3] Add missing test files --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 175901c5..e8ded55f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -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 From 5c36f844301e499785a6a559dc9d18fd9310a73d Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 26 Nov 2020 23:13:37 +0100 Subject: [PATCH 3/3] Ignore non version number entries in build_tools_path --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 06970d1f..fb2bbdab 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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