scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refined

Browse source
This commit is contained in:
butomo1989 2017-03-01 13:31:34 +01:00
parent e2b24dc170
commit 032552a5e9
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/android.py
View file

@ -59,8 +59,10 @@ def install_package(android_path, emulator_file, api_level, sys_img):
# Install package based on given android version # Install package based on given android version
cmd = 'echo y | android update sdk --no-ui -a -t android-{api},sys-img-{sys_img}-android-{api}'.format( cmd = 'echo y | android update sdk --no-ui -a -t android-{api},sys-img-{sys_img}-android-{api}'.format(
api=api_level, sys_img=sys_img) api=api_level, sys_img=sys_img)
logger.info('Android installation command : {install}'.format(install=cmd)) logger.info('SDK package installation command: {install}'.format(install=cmd))
subprocess.check_call('xterm -e \"{cmd}\"'.format(cmd=cmd), shell=True) titel = 'SDK package installation process'
subprocess.check_call('xterm -T "{titel}" -n "{titel}" -e \"{cmd}\"'.format(
titel=titel, cmd=cmd), shell=True)
def create_avd(android_path, device, skin, avd_name, api_level): def create_avd(android_path, device, skin, avd_name, api_level):
@ -88,8 +90,10 @@ def create_avd(android_path, device, skin, avd_name, api_level):
cmd = 'echo no | android create avd -f -n {name} -t android-{api}'.format(name=avd_name, api=api_level) cmd = 'echo no | android create avd -f -n {name} -t android-{api}'.format(name=avd_name, api=api_level)
if device and skin: if device and skin:
cmd += ' -d {device} -s {skin}'.format(device=device.replace(' ', '\ '), skin=skin) cmd += ' -d {device} -s {skin}'.format(device=device.replace(' ', '\ '), skin=skin)
logger.info('Emulator creation command : {cmd}'.format(cmd=cmd)) logger.info('AVD creation command: {cmd}'.format(cmd=cmd))
subprocess.check_call('xterm -e \"{cmd}\"'.format(cmd=cmd), shell=True) titel = 'AVD creation process'
subprocess.check_call('xterm -T "{titel}" -n "{titel}" -e \"{cmd}\"'.format(
titel=titel, cmd=cmd), shell=True)
def get_available_sdk_packages(): def get_available_sdk_packages():
@ -99,9 +103,8 @@ def get_available_sdk_packages():
:return: List of available packages. :return: List of available packages.
:rtype: bytearray :rtype: bytearray
""" """
cmd = ['android', 'list', 'sdk']
output_str = subprocess.check_output(cmd)
logger.info('List of Android SDK: ') logger.info('List of Android SDK: ')
output_str = subprocess.check_output('android list sdk'.split())
logger.info(output_str) logger.info(output_str)
return [output.strip() for output in output_str.split('\n')] if output_str else None return [output.strip() for output in output_str.split('\n')] if output_str else None

5
src/appium.py
View file

@ -30,8 +30,9 @@ def run(connect_to_grid, emulator_name, android_version):
cmd += ' --nodeconfig {file}'.format(file=CONFIG_FILE) cmd += ' --nodeconfig {file}'.format(file=CONFIG_FILE)
except ValueError as v_err: except ValueError as v_err:
logger.error(v_err) logger.error(v_err)
subprocess.check_call('xterm -T "{name}" -n "{name}" -e \"{cmd}\"'.format( titel = 'avd name: {name}'.format(name=emulator_name)
name=emulator_name, cmd=cmd), shell=True) subprocess.check_call('xterm -T "{titel}" -n "{titel}" -e \"{cmd}\"'.format(
titel=titel, cmd=cmd), shell=True)
def create_node_config(config_file, emulator_name, android_version, appium_host, appium_port, def create_node_config(config_file, emulator_name, android_version, appium_host, appium_port,