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

fix tests to work when only Debian Android SDK is installed

Browse source 
jenkins.debian.net only had `apt install android-sdk`, it does not have any
of Google's packages installed.
This commit is contained in:
Hans-Christoph Steiner 2017-11-08 13:51:03 +01:00
parent 3d3050d04f
commit 2ee32f3524
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/common.TestCase
View file

@ -70,7 +70,10 @@ class CommonTest(unittest.TestCase):
return False return False
def _find_all(self): def _find_all(self):
for cmd in ('aapt', 'adb', 'android', 'zipalign'): tools = ['aapt', 'adb', 'zipalign']
if os.path.exists(os.path.join(os.getenv('ANDROID_HOME'), 'tools', 'android')):
tools.append('android')
for cmd in tools:
path = fdroidserver.common.find_sdk_tools_cmd(cmd) path = fdroidserver.common.find_sdk_tools_cmd(cmd)
if path is not None: if path is not None:
self.assertTrue(os.path.exists(path)) self.assertTrue(os.path.exists(path))