增强app ui和API相互调用的相关方法
This commit is contained in:
parent
9bd2ac6ff8
commit
560fc1b5ee
|
@ -1,6 +1,6 @@
|
|||
# 作者 yanchunhuo
|
||||
# 创建时间 2019/12/26 11:15
|
||||
|
||||
# github https://github.com/yanchunhuo
|
||||
from pojo.app_ui_devices_info import APP_UI_Devices_Info
|
||||
import configparser as ConfigParser
|
||||
|
||||
|
@ -25,6 +25,11 @@ class Read_APP_UI_Devices_Info(object):
|
|||
get_lambda=lambda info:list(filter(None,info.split('||'))) if info else []
|
||||
devices_info.devices_desc=get_lambda(config.get('devices_info','devices_desc',fallback=''))
|
||||
devices_info.app_ui_configs = get_lambda(config.get('devices_info', 'app_ui_configs', fallback=''))
|
||||
api_configs=[]
|
||||
get_api_config=lambda tmp_api_config:list(filter(None,tmp_api_config.split('&&'))) if tmp_api_config else []
|
||||
for tmp_api_config in get_lambda(config.get('devices_info','api_configs',fallback='')):
|
||||
api_configs.append(get_api_config(tmp_api_config))
|
||||
devices_info.api_configs = api_configs
|
||||
devices_info.server_ports=get_lambda(config.get('devices_info','server_ports',fallback=''))
|
||||
devices_info.server_ips = get_lambda(config.get('devices_info', 'server_ips', fallback=''))
|
||||
system_auth_alert_labels=[]
|
||||
|
|
|
@ -7,6 +7,9 @@ devices_desc = xiaomi ||
|
|||
# 每台设备测试使用的配置文件名
|
||||
app_ui_configs = app_ui_android_demoProject_xiaomi.conf ||
|
||||
|
||||
# 每台设备测试使用的api配置文件名,多个api配置文件使用&&隔开,无则放空
|
||||
api_configs = app_ui_android_demoProject_xiaomi_api.conf ||
|
||||
|
||||
# 手机授权弹窗调过的文本,无则放空,一台手机有多个文本则用&&隔开
|
||||
system_auth_alert_labels = 允许 ||
|
||||
|
||||
|
|
|
@ -7,7 +7,8 @@ import os
|
|||
class APP_UI_Devices_Info:
|
||||
def __init__(self):
|
||||
self.devices_desc = []
|
||||
self.app_ui_configs=[]
|
||||
self.app_ui_configs = []
|
||||
self.api_configs = []
|
||||
self.server_ports = []
|
||||
self.server_ips = []
|
||||
self.system_auth_alert_labels = []
|
||||
|
@ -27,19 +28,21 @@ class APP_UI_Devices_Info:
|
|||
self.bundleIds = []
|
||||
self.apps_dirs = []
|
||||
self.apps_urls = []
|
||||
self.noSigns=[]
|
||||
self.fullResets=[]
|
||||
self.noSigns = []
|
||||
self.fullResets = []
|
||||
|
||||
def get_devices_info(self):
|
||||
devices_info = []
|
||||
local_ip = Read_Http_Server_Config().httpserver_config.local_ip
|
||||
httpserver_port = Read_Http_Server_Config().httpserver_config.httpserver_port
|
||||
for i in range(len(self.devices_desc)):
|
||||
device_info={}
|
||||
device_info.update({'device_desc':self.devices_desc[i].strip()})
|
||||
device_info = {}
|
||||
device_info.update({'device_desc': self.devices_desc[i].strip()})
|
||||
device_info.update({'app_ui_config': self.app_ui_configs[i].strip()})
|
||||
device_info.update({'server_port':self.server_ports[i].strip()})
|
||||
device_info.update({'server_ip':self.server_ips[i].strip()})
|
||||
if self.api_configs:
|
||||
device_info.update({'api_config': self.api_configs[i]})
|
||||
device_info.update({'server_port': self.server_ports[i].strip()})
|
||||
device_info.update({'server_ip': self.server_ips[i].strip()})
|
||||
if self.system_auth_alert_labels:
|
||||
device_info.update({'system_auth_alert_label': self.system_auth_alert_labels[i]})
|
||||
# 构建desired_capabilities
|
||||
|
@ -65,10 +68,10 @@ class APP_UI_Devices_Info:
|
|||
if len(self.apps_urls):
|
||||
a_device_apps = self.apps_urls[i].split('&&')
|
||||
a_device_capabilities_num = len(a_device_apps)
|
||||
a_devices_desired_capabilities=[]
|
||||
a_devices_desired_capabilities = []
|
||||
for j in range(a_device_capabilities_num):
|
||||
desired_capabilities={}
|
||||
desired_capabilities.update({'udid':self.udids[i].strip()})
|
||||
desired_capabilities = {}
|
||||
desired_capabilities.update({'udid': self.udids[i].strip()})
|
||||
desired_capabilities.update({'platformName': self.platformNames[i].strip()})
|
||||
if len(self.automationNames):
|
||||
desired_capabilities.update({'automationName': self.automationNames[i].strip()})
|
||||
|
@ -96,19 +99,19 @@ class APP_UI_Devices_Info:
|
|||
desired_capabilities.update({'appActivity': a_device_appActivitys[j].strip()})
|
||||
desired_capabilities.update({'appPackage': a_device_appPackages[j].strip()})
|
||||
if len(self.bundleIds):
|
||||
desired_capabilities.update({'bundleId':a_device_bundleIds[j].strip()})
|
||||
desired_capabilities.update({'bundleId': a_device_bundleIds[j].strip()})
|
||||
if len(self.apps_dirs) or len(self.apps_urls):
|
||||
desired_capabilities.update({'app': a_device_apps[j].strip()})
|
||||
if len(self.noSigns):
|
||||
noSign=False
|
||||
if 'true'==self.noSigns[i].strip().lower():
|
||||
noSign=True
|
||||
desired_capabilities.update({'noSign':noSign})
|
||||
noSign = False
|
||||
if 'true' == self.noSigns[i].strip().lower():
|
||||
noSign = True
|
||||
desired_capabilities.update({'noSign': noSign})
|
||||
if len(self.fullResets):
|
||||
fullReset=False
|
||||
if 'true'==self.fullResets[i].strip().lower():
|
||||
fullReset=True
|
||||
desired_capabilities.update({'fullReset':fullReset})
|
||||
fullReset = False
|
||||
if 'true' == self.fullResets[i].strip().lower():
|
||||
fullReset = True
|
||||
desired_capabilities.update({'fullReset': fullReset})
|
||||
a_devices_desired_capabilities.append(desired_capabilities)
|
||||
device_info.update({'capabilities': a_devices_desired_capabilities})
|
||||
# 完成一台设备构建
|
||||
|
|
Loading…
Reference in New Issue