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

Assign device_id via environment variable

Browse source
This commit is contained in:
Ankur Agarwal 2018-07-28 23:07:03 +05:30 committed by GitHub
parent 3673d195ea
commit 972445a8bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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
@ -191,6 +192,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
def run(): def run():
"""Run app.""" """Run app."""
device = os.getenv('DEVICE', 'Nexus 5') device = os.getenv('DEVICE', 'Nexus 5')
device_id = os.getenv('DEVICE_ID', str(uuid.uuid4()))
logger.info('Device: {device}'.format(device=device)) logger.info('Device: {device}'.format(device=device))
avd_name = '{device}_{version}'.format(device=device.replace(' ', '_').lower(), version=ANDROID_VERSION) avd_name = '{device}_{version}'.format(device=device.replace(' ', '_').lower(), version=ANDROID_VERSION)
@ -208,9 +210,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())