mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
update: allow tests to pass when apksigner is not installed
This is only for the v2/v3 signatures. fdroid/fdroidserver#627
This commit is contained in:
parent
35e67295e9
commit
d03b121152
@ -408,13 +408,16 @@ class UpdateTest(unittest.TestCase):
|
|||||||
|
|
||||||
print('USE_ANDROGUARD', use_androguard)
|
print('USE_ANDROGUARD', use_androguard)
|
||||||
|
|
||||||
apksigner = fdroidserver.common.find_sdk_tools_cmd('apksigner')
|
try:
|
||||||
if use_androguard and apksigner: # v2 parsing needs both
|
apksigner = fdroidserver.common.find_sdk_tools_cmd('apksigner')
|
||||||
config['apksigner'] = apksigner
|
if use_androguard and apksigner: # v2 parsing needs both
|
||||||
apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
|
config['apksigner'] = apksigner
|
||||||
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
|
||||||
self.assertEqual(apk_info.get('versionName'), 'v2-only')
|
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
||||||
self.assertEqual(apk_info.get('versionCode'), 2)
|
self.assertEqual(apk_info.get('versionName'), 'v2-only')
|
||||||
|
self.assertEqual(apk_info.get('versionCode'), 2)
|
||||||
|
except fdroidserver.exception.FDroidException:
|
||||||
|
print('WARNING: skipping v2-only test since apksigner cannot be found')
|
||||||
|
|
||||||
apk_info = fdroidserver.update.scan_apk('repo/v1.v2.sig_1020.apk')
|
apk_info = fdroidserver.update.scan_apk('repo/v1.v2.sig_1020.apk')
|
||||||
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
||||||
|
Loading…
Reference in New Issue
Block a user