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

Merge pull request #104 from devilankur18/master

Browse source 
Added device_id support via ENV variable or auto uuid values
This commit is contained in:
Budi Utomo 2018-07-31 09:04:58 +02:00 committed by GitHub
parent d0271e0be0 c4be3a1ac0
commit d13e60a122
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app.py
View file

@ -4,6 +4,7 @@ import json
import logging import logging
import os import os
import subprocess import subprocess
import uuid
from src import CHROME_DRIVER, CONFIG_FILE, ROOT from src import CHROME_DRIVER, CONFIG_FILE, ROOT
from src import log from src import log
@ -192,6 +193,8 @@ def run():
"""Run app.""" """Run app."""
device = os.getenv('DEVICE', 'Nexus 5') device = os.getenv('DEVICE', 'Nexus 5')
logger.info('Device: {device}'.format(device=device)) logger.info('Device: {device}'.format(device=device))
device_id = os.getenv('DEVICE_ID', str(uuid.uuid4()))
logger.info('Device Id: {device_id}'.format(device_id=device_id))
avd_name = '{device}_{version}'.format(device=device.replace(' ', '_').lower(), version=ANDROID_VERSION) avd_name = '{device}_{version}'.format(device=device.replace(' ', '_').lower(), version=ANDROID_VERSION)
logger.info('AVD name: {avd}'.format(avd=avd_name)) logger.info('AVD name: {avd}'.format(avd=avd_name))
@ -208,9 +211,9 @@ def run():
cfg.write('\ndisk.dataPartition.size={dp}'.format(dp=dp_size)) cfg.write('\ndisk.dataPartition.size={dp}'.format(dp=dp_size))
if is_first_run: if is_first_run:
cmd = 'emulator/emulator @{name} -gpu off -verbose -wipe-data'.format(name=avd_name) cmd = 'emulator/emulator @{name} -gpu off -prop emu.uuid={uuid} -verbose -wipe-data'.format(name=avd_name, uuid=device_id)
else: else:
cmd = 'emulator/emulator @{name} -gpu off -verbose'.format(name=avd_name) cmd = 'emulator/emulator @{name} -gpu off -prop emu.uuid={uuid} -verbose'.format(name=avd_name, uuid=device_id)
appium = convert_str_to_bool(str(os.getenv('APPIUM', False))) appium = convert_str_to_bool(str(os.getenv('APPIUM', False)))
if appium: if appium:
subprocess.Popen(cmd.split()) subprocess.Popen(cmd.split())