mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
use new find_apksigner in test_scan_apk
This commit is contained in:
parent
7eb32feaa5
commit
b2f6483671
@ -484,17 +484,16 @@ class UpdateTest(unittest.TestCase):
|
|||||||
|
|
||||||
print('USE_ANDROGUARD', use_androguard)
|
print('USE_ANDROGUARD', use_androguard)
|
||||||
|
|
||||||
try:
|
apksigner = fdroidserver.common.find_apksigner()
|
||||||
apksigner = fdroidserver.common.find_sdk_tools_cmd('apksigner')
|
if apksigner:
|
||||||
if use_androguard and apksigner: # v2 parsing needs both
|
if use_androguard: # v2 parsing needs both
|
||||||
config['apksigner'] = apksigner
|
config['apksigner'] = apksigner
|
||||||
apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
|
apk_info = fdroidserver.update.scan_apk('v2.only.sig_2.apk')
|
||||||
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
self.assertIsNone(apk_info.get('maxSdkVersion'))
|
||||||
self.assertEqual(apk_info.get('versionName'), 'v2-only')
|
self.assertEqual(apk_info.get('versionName'), 'v2-only')
|
||||||
self.assertEqual(apk_info.get('versionCode'), 2)
|
self.assertEqual(apk_info.get('versionCode'), 2)
|
||||||
except fdroidserver.exception.FDroidException:
|
else:
|
||||||
print('WARNING: skipping v2-only test since apksigner cannot be found')
|
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'))
|
||||||
self.assertEqual(apk_info.get('versionName'), 'v1+2')
|
self.assertEqual(apk_info.get('versionName'), 'v1+2')
|
||||||
|
Loading…
Reference in New Issue
Block a user