diff --git a/.gitignore b/.gitignore index 30eef63f523b6c674ef19809e2ab813e6039773b..4522504137c7a321b6ede2383b2c04e8312599c9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ .project target *.pyc -log \ No newline at end of file +log +.pyc \ No newline at end of file diff --git "a/air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" "b/air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" new file mode 100644 index 0000000000000000000000000000000000000000..1f872e1cc77bb1653230ca7f784fff4e15e7a321 --- /dev/null +++ "b/air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" @@ -0,0 +1,25 @@ +# -*- encoding=utf8 -*- +__author__ = "xiaohesheng" + +""" +case_tag:mdm-web,100086 +主数据平台:统一登录接口，第一步获取验证码，第二步登录系统，第三步平台登录验证token +""" + + +from common.common_func import commonFuc +import time + +module = "spd3" +#获取验证码接口 +import os +url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "VerifyCode_url") +print("aaaaaaaaaaaaaaaaaa"+url) +# token = commonFuc().get_token(module, "cancel_enc_user_id") +# timestamp = str(int(time.time())) +# payload = commonFuc().get_business_data(module, "payload") +# headers = commonFuc().get_business_data(module, "post_headers", token, timestamp, +# commonFuc().get_business_data(module, "cancel_contentType")) +# result = commonFuc().http_post(url, payload, headers) +# check_dict = commonFuc().get_business_data(module, "cancel_checkDict") +# commonFuc().check_result(check_dict, result) \ No newline at end of file diff --git a/common/case_tag_get.py b/common/case_tag_get.py index 800a4fdd926af0cfb56622c558e7450a3dc29e32..10e35e9cb06c33c479360516dc4288c18dbc0e0c 100644 --- a/common/case_tag_get.py +++ b/common/case_tag_get.py @@ -21,52 +21,78 @@ def get_message(case_path, case_name): return tags -def get_case_tag_list(case_path, tagList): +def get_case_tag_list(case_path, cases): """ 遍历case目录下的文件，从文件中获取case tag,加入列表中 + 再加个判断，判断是跑线上还是线下 """ + tagList = cases.split('#') + env = os.environ['ENV'] case_list = [] for f in os.listdir(case_path): - script = os.path.join(case_path, f) - air_name = f.replace('.air', '') - case_tags = get_message(script, air_name) - comLevels = list(set(case_tags)&set(tagList)) - if comLevels: - case_list.append(air_name) + nf_path = os.path.join(case_path, f) + if os.path.isdir(nf_path) and nf_path.endswith(".air") == False: + for nf in os.listdir(nf_path): + script = os.path.join(nf_path, nf) + if script.endswith(".air"): + air_name = nf.replace('.air', '') + case_tags = get_message(script, air_name) + flag = False + for con in tagList: + conList = con.split(',') + if list(set(case_tags) & set(conList)): + flag = True + else: + flag = False + break + if flag and (env in case_tags or env in ('sit', 'sita')): + case_hash = {} + case_hash["air_path"] = str(script) + case_hash["air_name"] = str(air_name) + case_hash["module"] = str(script.split(os.sep)[-2]) + case_list.append(case_hash) + else: + script = os.path.join(case_path, f) + if f.endswith(".air"): + air_name = f.replace('.air', '') + case_tags = get_message(script, air_name) + flag = False + for con in tagList: + conList = con.split(',') + if list(set(case_tags) & set(conList)): + flag = True + else: + flag = False + break + if flag and (env in case_tags or env in ('sit', 'sita')): + case_hash = {} + case_hash["air_path"] = str(script) + case_hash["air_name"] = str(air_name) + case_hash["module"] = str(script.split(os.sep)[-2]) + case_list.append(case_hash) return case_list -def get_author(case_path, case_name): - """ - 获取case是谁写的 - :return: - """ - name = 'Unknown' - pyfile = open(case_path + os.sep + case_name + '.air' + os.sep + case_name + '.py', 'r', encoding='utf-8') - lines = pyfile.readlines() - for line in lines: - if '__author__' in line: - line = line.split('__author__ = ')[-1] - name = line.replace('"', '') - name = name.strip().strip('\n') - pyfile.close() - return name -def get_case_by_author(case_path, user): +def get_case_tag_list_2(case_path, cases): """ - 根据作者执行用例 - :param case_path: - :param user: - :return: + 遍历case目录下的文件，从文件中获取case tag,加入列表中 """ + tagList = cases.split('#') case_list = [] for f in os.listdir(case_path): script = os.path.join(case_path, f) air_name = f.replace('.air', '') - author = get_author(case_path, air_name) case_tags = get_message(script, air_name) - tagList = ['core'] - comLevels = list(set(case_tags)&set(tagList)) - if user == author and comLevels: + flag = False + for con in tagList: + conList = con.split(',') + if list(set(case_tags) & set(conList)): + flag = True + else: + flag = False + break + if flag: case_list.append(air_name) return case_list + diff --git a/common/cli/runner.py b/common/cli/runner.py index 5bb905300273b0342847ecf1de8c4c2e9c4f6326..83099cf2ed74871e830689c26b2cc92dfc715538 100644 --- a/common/cli/runner.py +++ b/common/cli/runner.py @@ -112,7 +112,6 @@ def setup_by_args(args): devices = [args.device] else: devices = [] - print("do not connect device") # set base dir to find tpl dirpath, _ = script_dir_name(args.script) diff --git a/common/common_func.py b/common/common_func.py index b113be019db77a1fa43147213174a2e442ba9631..9ac3a3fdabac0aa6a22269f6f44130f5da41c461 100644 --- a/common/common_func.py +++ b/common/common_func.py @@ -1,23 +1,52 @@ -import yaml -import os -from common.rw import Rw -import requests +import base64 import json + +import requests from airtest.core.api import * + from common.confop import confOP +from common.dubboUtils import GetDubboService2, InvokeDubboApi +from common.rw import Rw + +workspace = os.path.abspath(".") +business_path = workspace + os.sep + "data" + os.sep class commonFuc(object): - def headers(self, token): - headers = { - 'clientInfo': '{"birthday":"2018-11-18","screenwidth":"375","clientVersion":"2.4.2","screenheight":"667","partner":"meitunmama","clientip":"10.180.81.127","traderName":"iPhone 6S","clientAppVersion":"2.4.2","clientYunyuVersion":"7.9.6","clientSystem":"ios","nettype":"wifi","deviceCode":"1f4b3860acfa303bca0407f5128bc5ea0f529fec"}', - 'platform': "1", - 'signature': "144c6b3c78fc20ad57da1ebdb879615b", - 'token': token, - 'timestamp': str(int(time.time())) - } - return headers + def find_path(self, module=""): + if module == "": + return business_path + else: + return business_path + module + os.sep + + def get_business_data(self, module, key, *args): + env = os.environ['ENV'] + data_list = confOP().getBusiYamlValue(self.find_path(module), "data") + if args is not None and len(args) > 0: + if isinstance(data_list[key], dict): + result = json.loads(json.dumps(data_list[key]) % args) + else: + if str(data_list[key]) == "": + result = data_list[key] + else: + result = data_list[key] % args + else: + result = data_list[key] + if "_sit_" in str(result) and "_on_" in str(result): + if env == "on": + return result["_on_"] + else: + return result["_sit_"] + else: + return result + + def get_message(self, module, key): + message_list = confOP().getBusiYamlValue(self.find_path(module), "message") + return message_list[key] + + def get_openauth_url(self): + return "http://openauth.meitun.com/tools/sign/create" def get_api_url(self): """ @@ -33,9 +62,15 @@ class commonFuc(object): elif env == 'sita': url = 'http://sita-m.meitun.com' else: - url = 'http://sit-m.meitun.com' + # url = 'http://sit-m.meitun.com' + url = 'http://spddev.cmic.com.cn' return url + def get_token(self, module, enc_user_id="enc_user_id"): + enc_user_id = self.get_business_data(module, enc_user_id) + token = self.check_token(enc_user_id) + return token + def check_token(self, enc_user_id='u779700044448'): """ 多个case同一个token不用一直查数据库 @@ -44,21 +79,27 @@ class commonFuc(object): """ env = os.environ['ENV'] result = Rw().r_token(enc_user_id, env) - print(result) - if result == None: + if result is None: return Rw().w_token(enc_user_id, env) else: return result["token"] - def http_get(self, url, token, params=""): + def http_get(self, url, headers="", params=""): """ 一个get请求，返回json """ - result = requests.get(url, headers=self.headers(token), params=params) - print(result.text) + result = requests.request("GET", url, headers=headers, params=params) result = json.loads(result.text) return result + def http_post(self, url, postdata=None, header=None): + """ + 一个post请求，返回json + """ + result = requests.post(url, data=postdata, headers=header) + result = json.loads(result.content) + return result + def check_result(self, check_dict, result): """ 结果检查，要检查的字段及值放在字典里, 结果是完全匹配 @@ -80,12 +121,12 @@ class commonFuc(object): else: for k, v in result.items(): res = self.analysis_json(key, v) - if res != None: + if res is not None: break elif self.typeof(result) == 'list': for value in result: res = self.analysis_json(key, value) - if res != None: + if res is not None: break else: pass @@ -114,10 +155,302 @@ class commonFuc(object): else: return None - def get_data(self, path, module): - return confOP().getBusiYamlValue(path, module) + def get_openApi_url(self): + """ + 获取openapi的接口 + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'https://openapi.meitun.com' + elif env == 'pre': + url = 'http://pre-openapi.meitun.com' + elif env == 'sita': + url = 'http://sita-openapi.meitun.com' + else: + url = 'http://sit-openapi.meitun.com' + return url + + def get_ip_by_pool(self, poolName, type='sit'): + """ + 根据hostname获取ip地址 + :param poolName: ip:端口/应用名:端口 + :param type: local/sit + :return: + """ + if str(type).lower() == 'local': + return poolName + else: + pool = str(poolName).split(":")[0] + print("pool: ", pool) + port = str(poolName).split(":")[1] + result = self.http_get( + "http://apollo.baobaoshu.com/apiv1/united_devices/?stage=%s&application=%s&usage=SERVER" % (type, pool)) + ip = result["results"][0]["ip"] + return str(ip) + ":" + port + + def run_local_dubbo(self, content, dubbo_service, dubbo_method, *args): + """ + 运行本地dubbo接口 + :param dubbo_service: dubbo中 服务名 如：com.zl.mall.api.IItemService + :param dubbo_method: 服务中的方法 如：updateItem + :param args: 方法请求需要的参数 + :return: + """ + dubbo_info = GetDubboService2().get_dubbo_info2(content) + invokeDubboApi = InvokeDubboApi(server_host=dubbo_info.get("server_host"), + server_post=dubbo_info.get("server_post")) + return invokeDubboApi.invoke_dubbo_api(dubbo_service, dubbo_method, *args) + + def get_open_url(self): + """ + 获取openapi的接口 + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'https://openapi.meitun.com' + elif env == 'pre': + url = 'http://pre-openapi.meitun.com' + elif env == 'sita': + url = 'http://sita-openapi.meitun.com' + else: + url = 'http://sit-openapi.meitun.com' + return url + + def get_openapi_signature(self, module, params): + """ + 获取openapi的验签 + :param module: + :param params: + :return: + """ + private_key = self.get_business_data(module, "private_key") + app_secret = self.get_business_data(module, "app_secret") + openauth_url = self.get_openauth_url() + data = self.get_business_data(module, "openapi_data", private_key, app_secret, params) + result = commonFuc().http_post(openauth_url, data) + signature = result['signature'] + return signature + + def get_url(self, pool=None): + """ + 根据环境或者url + :return: + """ + env = os.environ['ENV'] + print(env) + if pool =="bid": + if env == 'on': + url = 'http://bid.babytree.com' + else: + url = 'https://bid.babytree-test.com' + elif pool =="advertise-go-web": + url = 'http://g.kexin001.com' + elif pool =="ad_Delivery": + url = 'http://go.kexin001.com' + elif pool =="search-platform-index": + if env == 'on': + url = 'http://search-index.babytree.com/index/build' + else: + url = 'http://search-index.babytree-test.com/index/build' + elif pool =="search-platform-web": + if env == 'on': + url = 'http://search-query.babytree.com/search/query' + else: + url = 'http://search-query.babytree-test.com/search/query' + elif pool =="search-merger": + if env == 'on': + url = 'http://merger.babytree.com/search' + else: + url = 'http://merger.babytree-test.com/search' + elif pool =="search-suggest": + if env == 'on': + url = 'http://suggest.babytree.com' + else: + url = 'http://suggest.babytree-test.com' + else: + if env == 'on': + url = 'https://backend.meitunmama.com/' + elif env == 'pre': + url = 'http://pre-backend.meitunmama.com' + elif env == 'sita': + url = 'http://sita-backend.meitunmama.com' + else: + url = 'http://sit-backend.meitunmama.com' + + return url + def login_backend(self, driver): + driver.get(self.get_url()) + sleep(3) + #driver.assert_template(Template(r"tpl1580989830894.png", record_pos=(3.27, 2.99), resolution=(100, 100)), + #"请填写测试点") + driver.set_window_size(1366, 868) + if os.environ['ENV'] == 'on' or os.environ['ENV'] == 'pre': + es = 'aG9uZ2xp' + driver.find_element_by_id("loginName").send_keys(base64.b64decode(es.encode('utf-8')).decode("utf-8")) + sleep(1) + es = 'aGxiYjEyMTA5Mg==' + driver.find_element_by_xpath("//input[@type='password']").send_keys( + base64.b64decode(es.encode('utf-8')).decode("utf-8")) + sleep(1) + driver.find_element_by_id("smsCode").send_keys("111111") + sleep(1) + else: + driver.find_element_by_id("loginName").send_keys('autotest') + driver.find_element_by_xpath("//input[@type='password']").send_keys('123@qwe') + driver.find_element_by_id("smsCode").send_keys("111111") + driver.find_element_by_id("sub_btn").click() + sleep(2) + #driver.assert_template(Template(r"tpl1579258499558.png", record_pos=(0.47, 0.975), resolution=(100, 100)), + #"验证登录成功了") + # 选择打开页面的路径，如： 大健康-课程包-课程包管理 + def enter_channel_manage(self, driver, title, classfy, content): + driver.find_element_by_xpath("//a[@title='%s']" % title).click() + driver.find_element_by_id("east").find_element_by_xpath("//*[text()='%s']" % classfy).click() + driver.find_element_by_xpath("//a[@title='%s']" % content).click() + def enter_album_check(self, driver): + """ + 进入专辑审核页 + """ + driver.get( + self.get_url() + "/bighealth-service/outcourse/list.htm?source=1&linkId=big_health_audit_sync_btn1_link&tabId=big_health_audit_sync_btn1") + def remove_readonly(self, driver): + """ + 去除input的只读属性 + """ + inputs = driver.find_elements_by_tag_name("input") + for input in inputs: + driver.execute_script('arguments[0].removeAttribute(\"readonly\")', input) + driver.execute_script('arguments[0].removeAttribute(\"autocomplete\")', input) + def check_variable_exist(self, check_list, result): + """ + 结果检查，检查字段值存在 + """ + Flag = False + for variable in check_list: + if variable in result.keys(): + Flag = True + assert_equal(Flag, True, '验证参数' + variable + "存在") + + def enter_h5_page(self, driver, params): + """ + :param driver: + :param params: 请求的URL + :return: + """ + url = self.get_api_url() + driver.get(url + params) + + def get_start(self, pageno, pagesize): + """ + 获取limit的start数 + :param pageno: + :param pagesize: + :return: + """ + return (pageno - 1) * pagesize + + def click_iterm(self, driver, el_list, name): + """ + 点击对应元素 + """ + for el in el_list: + print(el.text) + if el.text == name: + driver.execute_script("arguments[0].scrollIntoView();", el) + el.click() + break + + def get_mapi_babytree_url(self): + """ + 接口mapi_babytree类型的请求 + :return: + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'http://mapiweb.babytree.com' + elif env == 'pre': + url = 'http://pre-mapiweb.babytree.com' + else: + url = 'http://mapiweb.babytree-test.com' + return url + + def get_localhome_babytree_url(self): + """ + 接口mapi_babytree类型的请求 + :return: + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'http://localhome.babytree.com' + elif env == 'pre': + url = 'http://pre-localhome.babytree.com' + else: + url = 'http://localhome.babytree-test.com' + return url + + def get_go_babytree_url(self): + """ + 接口go_babytree类型的请求 + :return: + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'http://go.babytree.com' + elif env == 'pre': + url = 'http://go.babytree.com' + else: + url = 'http://go-1.babytree-test.com' + return url + + def get_inno_babytree_url(self): + """ + 接口mapi_babytree类型的请求 + :return: + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'http://apilocal.babytree.com' + elif env == 'pre': + url = 'http://pre-apilocal.babytree.com' + else: + url = 'http://apilocal.babytree-test.com' + return url + + + def get_localfront_babytree_url(self): + """ + 接口mapi_babytree类型的请求 + :return: + """ + env = os.environ['ENV'] + print(env) + if env == 'on': + url = 'http://localfront.babytree.com' + elif env == 'pre': + url = 'http://pre-localfront.babytree.com' + else: + url = 'http://localfront.babytree-test.com' + return url + + def get_search_platform_hz_index_url(self): + """ + 接口类型的请求 + :return: + """ + env = os.environ['ENV'] + if env == 'on': + url = 'http://search-index.babytree.com' + else: + url = 'http://sit-search-index.babytree.com' + return url \ No newline at end of file diff --git a/common/confop.py b/common/confop.py index 2bfb9ec0ff8a819186d2cb9a005d911c1fb3d88f..87f02a71e66c6b4effbee524d744793678f3596f 100644 --- a/common/confop.py +++ b/common/confop.py @@ -6,21 +6,41 @@ cf = configparser.ConfigParser() curPath = os.path.abspath(os.path.dirname(__file__)) rootPath = rootPath = os.path.split(curPath)[0] -def getConfValue(filename, section, option, type='string'): - cf.read(filename) - if (type == 'string'): - value = cf.get(section, option) - else: - value = cf.getint(section, option) - return value - -def getYamlValue(filename): - file = os.path.join(rootPath, "data" + os.sep + filename) - f = open(file, 'r', encoding='utf-8') - cont = f.read() - value = yaml.load(cont) - f.close() - return value +class confOP: + def getConfValue(self, filename, section, option, type='string'): + cf.read(filename) + if (type == 'string'): + value = cf.get(section, option) + else: + value = cf.getint(section, option) + return value + + def getYamlValue(self, filename): + """ + 获取公共sql中的sql + :param filename: + :return: + """ + file = os.path.join(rootPath, "data" + os.sep + filename) + f = open(file, 'r', encoding='utf-8') + cont = f.read() + value = yaml.load(cont, Loader=yaml.FullLoader) + f.close() + return value + + def getBusiYamlValue(self, path, filename): + """ + 获取业务中的yaml文件数据 + :param path: + :param filename: + :return: + """ + file = os.path.join(path, filename) + f = open(file, 'r', encoding='utf-8') + cont = f.read() + value = yaml.load(cont, Loader=yaml.FullLoader) + f.close() + return value diff --git a/common/data b/common/data index 27f6583c9edd70e516658650d0a3235003b05a35..9734f5b1ccea88dd854fd685f188058d485feaa3 100644 --- a/common/data +++ b/common/data @@ -1,4 +1,4 @@ u779700044448_sit: - time: 2021-03-02 14:48:30.914746 - token: u779700044448_5c36630e639120c4471f216c928ffa2e_1614305054 + time: 2021-12-27 17:11:01.269465 + token: u779700044448_562a6850c0ed622ce15bb087140e27e3_1640592012 enc_user_id: u779700044448 diff --git a/common/db/conf.ini b/common/db/conf.ini index 125bb2852b2daed82b584fba454643ab8686e6f1..ed5445574e346444168eaec34b7d67415764e08f 100644 --- a/common/db/conf.ini +++ b/common/db/conf.ini @@ -1,9 +1,14 @@ - [meitun_db] -host = 192.168.24.42 +host = rm-bp18as20m3solyi69.mysql.rds.aliyuncs.com port = 3306 -user = developer -password = DJ@TdX73 +user = test_admin +password = ahdp0b.cr76_Pje1 + +[bj_db] +host = 172.25.1.6 +port = 3320 +user = local_rw +password = baidugoogleyahoo [promotion] livedb = 19 @@ -21,3 +26,4 @@ port = 27017 redis_host=192.168.24.31 + diff --git a/common/db/db.py b/common/db/db.py index ce23bb080060dad4644f353639ce04ca439f205c..6dfd8e746f14c096d1a738bcec5570d54c4eb3a8 100644 --- a/common/db/db.py +++ b/common/db/db.py @@ -1,41 +1,56 @@ import pymysql import os +import sys +from common.confop import confOP +from common.db.sql.sqlByIdb import sqlByIdb +import pymongo curPath = os.path.abspath(os.path.dirname(__file__)) rootPath = os.path.split(curPath)[0] -import sys sys.path.append(rootPath) -from common import confop -import pandas as pd -import pymongo -import redis -class dbOP: - def selectSql(self, schema, param=[], db="meitun_db"): +class dbOP(): + def __init__(self, path=rootPath): + self.path = path + + def selectSql(self, schema, param=[], db="bj_db"): host = mySql().getConf(db)[0] port = mySql().getConf(db)[1] user = mySql().getConf(db)[2] pwd = mySql().getConf(db)[3] - value = confop.getYamlValue("sql") - mySql().selectSql(host, port, user, pwd, value[schema][0], value[schema][1], param) + value = confOP().getYamlValue("sql") + if schema not in value: + value = confOP().getBusiYamlValue(self.path, "sql") + env = os.environ["ENV"] + if env == "on" or env == "pre": + database = value[schema][0] + sql = value[schema][1] + param = param + result = sqlByIdb().selectSql(database, sql, param, env) + else: + result = mySql().selectSql(host, port, user, pwd, value[schema][0], value[schema][1], param) + return result - def ddlSql(self, schema, param=[], db="meitun_db"): + def ddlSql(self, schema, param=[], db="bj_db"): host = mySql().getConf(db)[0] port = mySql().getConf(db)[1] user = mySql().getConf(db)[2] pwd = mySql().getConf(db)[3] - value = confop.getYamlValue("sql") - mySql().executeUpdate(host,port,user,pwd,value[schema][0],value[schema][1], param) + value = confOP().getYamlValue("sql") + if schema not in value: + value = confOP().getBusiYamlValue(self.path, "sql") + result = mySql().executeUpdate(host, port, user, pwd, value[schema][0], value[schema][1], param) + return result class mySql: def __init__(self): pass - def getConf(self,db="meitun_db"): - host = confop.getConfValue("conf.ini", db, "host") - port = confop.getConfValue("conf.ini", db, "port", "int") - user = confop.getConfValue("conf.ini", db, "user") - pwd = confop.getConfValue("conf.ini", db, "password") + def getConf(self, db="bj_db"): + host = confOP().getConfValue(curPath + "/conf.ini", db, "host") + port = confOP().getConfValue(curPath + "/conf.ini", db, "port", "int") + user = confOP().getConfValue(curPath + "/conf.ini", db, "user") + pwd = confOP().getConfValue(curPath + "/conf.ini", db, "password") return host,port,user,pwd def connection(self, host, port, user, pwd, database): @@ -52,21 +67,20 @@ class mySql: for i in cols: col.append(i[0]) data = list(map(list, data)) - result = pd.DataFrame(data, columns=col) - return result + return data except Exception as e: print(e) conn.rollback() cursor.close() conn.close() - def executeUpdate(self, host, port,user,pwd,database, sql, param=[]): - conn = self.connection(host, port,user,pwd,database) + def executeUpdate(self, host, port, user, pwd, database, sql, param=[]): + conn = self.connection(host, port, user, pwd, database) cursor = conn.cursor() try: - cursor.execute(sql, param) + ret = cursor.execute(sql, param) conn.commit() - return cursor + return ret except Exception as e: print(e) conn.rollback() @@ -77,8 +91,8 @@ class mySql: class mongodb: def connection(self,db,collect): - ip = confop.getConfValue("conf.ini", "mongo", "ip") - port = confop.getConfValue("conf.ini", "mongo", "port") + ip = confOP().getConfValue(curPath + "/conf.ini", "mongo", "ip") + port = confOP().getConfValue(curPath + "/conf.ini", "mongo", "port") path = "mongodb://" + ip + ":" + port + "/" myclient = pymongo.MongoClient(path) mydb = myclient[db] @@ -89,7 +103,7 @@ class mongodb: def findALl(self, db, collect): result = [] mycol = self.connection(db, collect) - for x in mycol.find(): + for x in mycol.find(): result.append(x) return result @@ -102,25 +116,20 @@ class mongodb: return result -class redisClass: - def connect(self): - redis_host = confop.getConfValue("conf.ini", "redis", "redis_host") - pool = redis.ConnectionPool(host=redis_host) - r = redis.Redis(connection_pool=pool) - return r - def getValue(self,key): - r = redisClass().connect() - return r.get(key) if __name__ == '__main__': + env = 'sit' + os.environ['ENV'] = env.lower() + path = "D:\\myCode\\autotest-airtest-local\\data\\月嫂" #mysql的例子 - dbOP().selectSql("prc_prom_price", [13]) + result = dbOP(path).selectSql("local_worker_info") + print(result[0]) #monggdb的例子 - mongodb().findByCon("yapi","user", {"role": "admin"}) + #mongodb().findByCon("yapi","user", {"role": "admin"}) #redis的例子 - redisClass().connect() + #redisClass().connect() diff --git a/common/dubboUtils.py b/common/dubboUtils.py index 699a9d10a86ffc8de5f36737fdced649f60ab58d..9ddfb04f170447cf71ca37ec480d5c92044d4039 100644 --- a/common/dubboUtils.py +++ b/common/dubboUtils.py @@ -57,12 +57,12 @@ class InvokeDubboApi(object): def invoke_dubbo_api(self, dubbo_service, dubbor_method, args): api_name = dubbo_service + "." + dubbor_method + "({})" cmd = "invoke " + api_name.format(args) - print("调用命令是：{}".format(cmd)) + # print("调用命令是：{}".format(cmd)) resp0 = None try: if self.login_flag: resp0 = self.telnet_client.execute_some_command(cmd) - print("接口响应是,resp={}".format(resp0)) + # print("接口响应是,resp={}".format(resp0)) # dubbo接口返回的数据中有 elapsed: 4 ms. 耗时，需要使用elapsed 进行切割 return str(re.compile(".+").findall(resp0).pop(0)).split("elapsed").pop(0).strip() else: diff --git a/common/run_case_conditions.py b/common/run_case_conditions.py index f59c8fd02648489dddac2b47229e37282551445d..548c7a170c032eb98ae3922874572d82804b8713 100644 --- a/common/run_case_conditions.py +++ b/common/run_case_conditions.py @@ -2,18 +2,21 @@ from common.cli.runner import AirtestCase, run_script from argparse import * import jinja2 -import json +import shutil import os import io import time -import multiprocessing as mp -from multiprocessing import Process, JoinableQueue, Pool import re -import math import report.report.report as report import logging from airtest.utils.logger import get_logger +from multiprocessing import Pool +import math import requests +import json +import random +from common.confop import confOP + class CustomAirTestCase(AirtestCase): # @classMethod @@ -36,54 +39,96 @@ class CustomAirTestCase(AirtestCase): :param log_path: :param runtime_log: """ - self.manager = mp.Manager self.workspace = work_space self.case_path = case_path self.log_path = log_path self.runtime_log = runtime_log - self.device_dict = self.manager().dict() level = self.get_log_level(log_level) logger = get_logger("airtest") logger.setLevel(level) - def get_log_level(self, log_level): - if log_level == 'WARN': - return logging.WARN - elif log_level == 'DEBUG': - return logging.DEBUG - elif log_level == 'INFO': - return logging.INFO + def get_phone_by_user(self, user): + url = "http://cloud.baobaoshu.com/cloud/groupUser/findPhoneByUser?name=%s" % user + payload = {} + headers = { + 'Content-Type': 'application/json' + } + response = requests.request("GET", url, headers=headers, data=payload) + result = json.loads(response.text) + return result["data"] + + def dingding_send_markdown(self, env, title, content, job_url, author, token): + at_phones = "@" + at = { + "atMobiles": [ + # 需要填写自己的手机号，钉钉通过手机号@对应人 + ], + "isAtAll": True # 是否@所有人，默认否 + } + if author in ["zhangaizhen", "caiyubing", "hongli", "lihong", "wuchenlong"]: + at_phones = "@ALL" else: - print("输入日志信息不对") - return logging.DEBUG + phones = self.get_phone_by_user(author) + if phones.isdigit(): + at_phones = at_phones + phones + at["isAtAll"] = False + else: + at_phones = "@ALL" + at["isAtAll"] = True + phoneArr = [] + phoneArr.append(str(phones)) + at["atMobiles"] = phoneArr - def dingding_send(self, content): """ - 报错的用例发钉钉群 - :param content: + 报错的用例以markdown的格式发钉钉群 + :param title: 消息主题 + :param content: 消息内容 :return: """ - url = 'https://oapi.dingtalk.com/robot/send?access_token=d9e673ded1ab61ee6a631333a3d80b4291684e3adf61169ab6c1bb83d375e26d' + url = 'https://oapi.dingtalk.com/robot/send?access_token=%s' % token pagrem = { - "msgtype": "text", - "text": { - "content": content + "msgtype": "markdown", + "markdown": { + "title": "自动化执行结果", + "text": "#### **[" + str(env) + "环境]" + str(title) + " 用例报错** \n> ##### 执行链接: " + str( + job_url) + "\n> ##### 接口返回值: " + str(content) + " " + str(at_phones) }, - "at": { - "atMobiles": [ - - ], - "isAtAll": True # 是否@所有人，默认否 - } + "at": at } headers = { 'Content-Type': 'application/json' } response = requests.post(url, data=json.dumps(pagrem), headers=headers) - print(response.text) return response.text + def get_error_log_info(self, log): + """ + 获取报错的日志 + :param log: + :return: + """ + txt_log = os.path.join(log, 'log.txt') + f = open(txt_log, 'r', encoding='utf-8') + lines = f.readlines() + f.close() + for line in lines: + if "assert_not_equal" in line: + expect_val = json.loads(line)["data"]["call_args"]["first"] + return expect_val + else: + return "" + + def get_log_level(self, log_level): + if log_level == 'warn': + return logging.WARN + elif log_level == 'debug': + return logging.DEBUG + elif log_level == 'info': + return logging.INFO + else: + print("输入日志信息不对") + return logging.DEBUG def setUp(self): print("custom setup") @@ -93,23 +138,60 @@ class CustomAirTestCase(AirtestCase): print("custom tearDown") super(CustomAirTestCase, self).tearDown() - def get_author(self, case_name): + def get_author(self, case_name, filepath): """ 获取case是谁写的 :return: """ name = 'Unknown' - pyfile = open(self.case_path + os.sep + case_name + '.air' + os.sep + case_name + '.py', 'r', encoding='utf-8') + pyfile = open(filepath + os.sep + case_name + '.air' + os.sep + case_name + '.py', 'r', encoding='utf-8') lines = pyfile.readlines() for line in lines: + line = line.replace(" ", "") if '__author__' in line: - line = line.split('__author__ = ')[-1] + line = line.split('__author__=')[-1] name = line.replace('"', '') name = name.strip().strip('\n') pyfile.close() - print(name) return name + def create_log(self, log_path, air_name): + """ + 创建对应case的log 文件 + :return: + """ + if os.path.isdir(log_path): + pass + else: + os.makedirs(log_path) + log = os.path.join(log_path, air_name) + if os.path.isdir(log): + shutil.rmtree(log) + else: + os.makedirs(log) + return log + + def get_case_runtime(self, log): + """ + 读取case运行日志，获取case执行开始时间，结束时间 + :param log: + :return: + """ + txt_log = os.path.join(log, 'log.txt') + f = open(txt_log, 'r', encoding='utf-8') + lines = f.readlines() + + f.close() + start_time = float(re.findall('.*"start_time": (.*), "ret".*', lines[0])[0]) + start_time = int(start_time * 1000) + try: + end_time = float(re.findall('.*"end_time": (.*)}}.*', lines[-1])[0]) + except: + # case执行失败的话没打end_time + end_time = float(re.findall('.*"time": (.*), "data".*', lines[-2])[0]) + end_time = int(end_time * 1000) + return start_time, end_time + def assign_tasks(self, task_list, num): """ 将任务平均分配给num个设备跑 @@ -135,69 +217,46 @@ class CustomAirTestCase(AirtestCase): if script in case_dict[k]: return k - - def get_all_dir(self, case_name): + def get_cases_and_log(self, case_name, device_list): """ - :return: 获得需要执行的所有air的文件夹，同时创建单个log目录 + :return: 获得需要执行的所有air的文件夹，同时对每个设备创建log目录 """ dirs_ls = [] for dirs in os.listdir(self.case_path): isdir = os.path.join(self.case_path, dirs) if os.path.isdir(isdir) and isdir.endswith(".air"): air_name = dirs.replace('.air', '') - if 'all' in case_name or air_name in case_name: + if case_name == 'all' or air_name in case_name: script = os.path.join(self.case_path, isdir) dirs_ls.append(script) - log = self.create_log(self.log_path, air_name) - CustomAirTestCase.log_list.append(log) + for device in device_list: + self.create_log(os.path.join(self.log_path, device), air_name) return dirs_ls - def get_cases_and_log(self, case_name, device_list): + def get_all_dir(self, case_name): """ - :return: 获得需要执行的所有air的文件夹，同时对每个设备创建log目录 + :return: 获得需要执行的所有air的文件夹，同时创建单个log目录 """ dirs_ls = [] for dirs in os.listdir(self.case_path): isdir = os.path.join(self.case_path, dirs) if os.path.isdir(isdir) and isdir.endswith(".air"): air_name = dirs.replace('.air', '') - if case_name == 'all' or air_name in case_name: + if 'all' in case_name or air_name in case_name: script = os.path.join(self.case_path, isdir) dirs_ls.append(script) - for device in device_list: - self.create_log(os.path.join(self.log_path, device), air_name) + log = self.create_log(self.log_path, air_name) + CustomAirTestCase.log_list.append(log) return dirs_ls - def create_log(self, log_path, air_name): - """ - 创建对应case的log 文件 - :return: - """ - if os.path.isdir(log_path): - pass - else: - print("创建目录：" + log_path) - os.makedirs(log_path) - log = os.path.join(log_path, air_name) - if os.path.isdir(log): - pass - else: - os.makedirs(log) - print(str(log) + 'is created') - return log - - def do_run_by_pool(self, run_device, cases, log_path, log_level): + def do_run_by_pool(self, run_device, cases, log_path): """ 在指定设备上跑指定脚本 :param run_device: - :param cases: - :param log_path: - :param log_level: + :param script: + :param log: :return: """ - level = self.get_log_level(log_level) - logger = get_logger("airtest") - logger.setLevel(level) run_device = 'Android:///' + run_device for script in cases: air_name = script.split(os.sep)[-1].replace('.air', '') @@ -210,34 +269,36 @@ class CustomAirTestCase(AirtestCase): pass print(run_device + ' run ' + script + ' ---->end') - def get_case_runtime(self, log): + def doReport(self, results, total, report_name): """ - 读取case运行日志，获取case执行开始时间，结束时间 - :param log: + 输出具体报告 + :param case_results: + :param summary_message: + :param device: :return: """ - txt_log = os.path.join(log, 'log.txt') - f = open(txt_log, 'r') - lines = f.readlines() - - f.close() - if len(lines) > 0: - start_time_mes = re.findall('.*"start_time": (.*), "ret".*', lines[0]) - # 有可能手机没装app 或者其他问题导致日志里没有start_time, 所以要做个判断。 - if len(start_time_mes) > 0: - start_time = float(start_time_mes[0]) - start_time = int(start_time * 1000) - try: - end_time = float(re.findall('.*"end_time": (.*)}}.*', lines[-1])[0]) - except: - # case执行失败的话没打end_time - end_time = float(re.findall('.*"time": (.*), "data".*', lines[-2])[0]) - end_time = int(end_time * 1000) - else: - return 0, 1 + report_path = os.path.join(self.workspace, 'report') + if len(results) == 0: + print("没有执行case") + return else: - return 0, 1 - return start_time, end_time + env = jinja2.Environment( + loader=jinja2.FileSystemLoader(os.path.join(self.workspace, 'templates')), + extensions=(), + autoescape=True + ) + total["passRate"] = round(total["passNum"]*100/total["caseNum"], 2) + template = env.get_template("summary_template.html") + # log_path必须传相对路径，要不在jenkins上展示报告会报错 + log_path = '../log' + # report_name 是根据设备命名的，如果report_name里有设备名的话，那log_path得加一层设备名 + if '_' in report_name: + log_path = '../log/' + report_name.split('_')[-1].replace('.html', '') + html = template.render({"case_results": results, "summary_message": total, "log_path": log_path}) + output_file = os.path.join(report_path, report_name) + with io.open(output_file, 'w', encoding="utf-8") as f: + f.write(html) + print("报告文件: " + output_file) def delWithLogToReportByDevice(self, script_list, device): """ @@ -268,21 +329,10 @@ class CustomAirTestCase(AirtestCase): result["result"] = rpt.test_result if result["result"]: summary_message["passNum"] += 1 - else: - if air_name in ('initialized', 'initialize_oppo') and device != 'B2T7N16A28002135': - self.dingding_send("设备检查： " + device + "解锁及检查失败") - elif air_name == 'install_app': - self.dingding_send("设备检查： " + device + "安装app失败") - else: - pass start, end = self.get_case_runtime(log) result["time"] = (end - start)/1000 if end > start else 0 - author = self.get_author(air_name) - result["author"] = author case_results.append(result) summary_message["caseNum"] = count - summary_message["passRate"] = round(summary_message["passNum"]*100/count, 2) - summary_message["time"] = CustomAirTestCase.summary_message["time"] report_name = 'summary_' + device + '.html' self.doReport(case_results, summary_message, report_name) @@ -314,117 +364,102 @@ class CustomAirTestCase(AirtestCase): except: start = 1 end = 60 - result["time"] = (end - start)/1000 if end > start else 0 - author = self.get_author(air_name) + result["time"] = (end - start) / 1000 if end > start else 0 + author = self.get_author(air_name, self.case_path) result["author"] = author - result['device'] = self.device_dict[air_name] CustomAirTestCase.case_results.append(result) CustomAirTestCase.summary_message["caseNum"] = count - CustomAirTestCase.summary_message["passRate"] = round(CustomAirTestCase.summary_message["passNum"]\ - * 100/CustomAirTestCase.summary_message["caseNum"], 2) - print("summary_message:") - print(CustomAirTestCase.summary_message) + CustomAirTestCase.summary_message["passRate"] = round(CustomAirTestCase.summary_message["passNum"] \ + * 100 / CustomAirTestCase.summary_message["caseNum"], 2) self.doReport(CustomAirTestCase.case_results, CustomAirTestCase.summary_message, 'summary.html') - def doReport(self, results, total, report_name): - """ - 输出具体报告 - :param results: - :param total: - :param report_name: - :return: + def run_case(self, run_case, case_name, job_url, case_scenario_name): """ - report_path = os.path.join(self.workspace, 'report') - if len(results) == 0: - print("没有执行case") - return - else: - env = jinja2.Environment( - loader=jinja2.FileSystemLoader(os.path.join(self.workspace, 'templates')), - extensions=(), - autoescape=True - ) - total["passRate"] = round(total["passNum"]*100/total["caseNum"], 2) - template = env.get_template("summary_template.html") - # log_path必须传相对路径，要不在jenkins上展示报告会报错 - log_path = '../log' - # report_name 是根据设备命名的，如果report_name里有设备名的话，那log_path得加一层设备名 - if '_' in report_name: - log_path = '../log/' + report_name.split('_')[-1].replace('.html', '') - html = template.render({"case_results": results, "summary_message": total, "log_path": log_path}) - output_file = os.path.join(report_path, report_name) - with io.open(output_file, 'w', encoding="utf-8") as f: - f.write(html) - print("报告文件: " + output_file) - - def producer(self, script_list, q): - for script in script_list: - q.put(script) - q.join() - - def consumer(self, device, q, log_level): - level = self.get_log_level(log_level) - logger = get_logger("airtest") - logger.setLevel(level) - while True: - script = q.get() - run_device = 'Android:///' + device - # 执行脚本 - air_name = script.split(os.sep)[-1].replace('.air', '') - log = os.path.join(self.log_path, air_name) - print(device + ' run ' + script + ' ---->start') - args = Namespace(device=run_device, log=log, recording=None, script=script) - try: - run_script(args, AirtestCase) - except: - print("噢？ 失败啦") - pass - finally: - self.device_dict[air_name] = device - print(device + ' run ' + script + ' ---->end') - print('\033[45m%s 执行了 %s\033[0m' % (os.getpid(), script)) - q.task_done() # 向q.join()发送一次信号,证明一个数据已经被取走了 - - def run_case_by_distri(self, device_list, case_name, log_level): - """ - 多进程跑case，将任务平均分给不同的设备，多进程跑，都跑完后，读取各case的log.txt 文件，获取case的开始结束时间信息 - :param device_list + 运行单个case :param case_name: - :param log_level: - :return: + :return: 返回case的运行结果集合，包括case名，case执行起止时间，供校验埋点的时候用 """ - workers = [] + summary_message = {} + summary_message["caseNum"] = 0 + summary_message["passNum"] = 0 all_start = int(time.time() * 1000) - # 获取所有需要执行的用例集 - script_list = self.get_all_dir(case_name) - #random.shuffle(script_list) - device_count = len(device_list) - - q = JoinableQueue() - # 生产者们:收集要执行的用例 - p1 = Process(target=self.producer, args=(script_list, q)) - workers.append(p1) - print("我们总共需要执行" + str(len(workers)) + "个用例") - print("奥力给！") - # 消费者们:各设备执行用例 - for i in range(device_count): - c1 = Process(target=self.consumer, args=(device_list[i], q, log_level)) - c1.daemon = True - workers.append(c1) - - # 开始 - for p in workers: - time.sleep(2) - p.start() - - p1.join() - print("all SubProcesses done") + fp = open(self.runtime_log, 'w+', encoding='utf-8') + report_dir = '../../report/report/' + static_root = report_dir + case_image_dir = '../../air_case' + lang = 'zh' + plugin = ['airtest_selenium.report'] + # 聚合结果 + case_results = [] + # d获取所有用例集 + for filepath, dirnames, filenames in os.walk(self.case_path): + for f in dirnames: + if f.endswith(".air"): + # f为.air用例名称：demo.air + air_name = f.replace('.air', '') + if 'all' in case_name or air_name in case_name: + script = os.path.join(filepath, f) + # 创建日志 + log = self.create_log(self.log_path, air_name) + output_file = os.path.join(log, 'log.html') + # global args + args = Namespace(device=None, log=log, recording=None, script=script) + start = int(time.time() * 1000) + try: + flag = False + i = 0 + if "AutoTest_" in log: + while flag == False and i < 2: + try: + run_script(args, AirtestCase) + flag = True + i += 1 + print("yes,SUCCESS") + except: + i += 1 + pass + else: + run_script(args, AirtestCase) + flag = True + print("yes,SUCCESS") + except: + pass + print("oh, FAILED") + finally: + end = int(time.time() * 1000) + author = self.get_author(air_name, filepath) + fp.write(air_name + '\t' + str(start) + '\t' + str(end) + '\t' + author + '\n') + log_root = 'log/' + air_name + report.main(log_root, static_root, script, lang, plugin, report_dir, case_image_dir, output_file) + result = {} + result["name"] = air_name + result["result"] = flag + result["author"] = author + result["time"] = (end - start) / 1000 if end > start else 0 + case_results.append(result) + if flag == False: + msg = confOP().getYamlValue("msg") + token = msg["dingding_msg"][0] + if "AutoTest_" in log and token != None: + title = air_name + if air_name in case_scenario_name: + title = case_scenario_name[air_name] + "---" + air_name + content = self.get_error_log_info(log) + env = os.environ['ENV'] + if len(str(content)) > 20000: + content = str(content)[1:300] + self.dingding_send_markdown(env, title, content, job_url, author, token) + print("case 执行完毕，开始生成报告") + fp.close() seconds = (int(time.time() * 1000) - all_start) / 1000 m, s = divmod(seconds, 60) - CustomAirTestCase.summary_message["time"] = "%d分%d秒" % (m, s) - self.delWithLogToReport(script_list) + summary_message["time"] = "%d分%d秒" % (m, s) + new_case_result, summary_message = self.merge_run_result(run_case, case_results, summary_message) + self.doReport(new_case_result, summary_message, 'summary.html') + self.merge_log_txt(run_case, static_root, lang, plugin, report_dir, case_image_dir) + print("报告已生成") - def run_case(self, device, case_name): + def run_case_single(self, device, case_name): """ 运行单个case :param device: @@ -435,7 +470,7 @@ class CustomAirTestCase(AirtestCase): summary_message["caseNum"] = 0 summary_message["passNum"] = 0 all_start = int(time.time() * 1000) - fp = open(self.runtime_log, 'w+') + fp = open(self.runtime_log, 'w+', encoding='utf-8') # 聚合结果 case_results = [] # d获取所有用例集 @@ -454,12 +489,12 @@ class CustomAirTestCase(AirtestCase): start = int(time.time() * 1000) try: run_script(args, AirtestCase) - # summary_message["passNum"] += 1 + summary_message["passNum"] += 1 except: pass finally: end = int(time.time() * 1000) - author = self.get_author(air_name) + author = self.get_author(air_name, self.case_path) fp.write(device + '\t' + air_name + '\t' + str(start) + '\t' + str(end) + '\t' + author + '\n') rpt = report.LogToHtml(script, log) report_dir = '../../report/report/' @@ -468,11 +503,7 @@ class CustomAirTestCase(AirtestCase): result = {} result["name"] = air_name result["result"] = rpt.test_result - if result["result"]: - summary_message["passNum"] += 1 result["time"] = (end - start) / 1000 if end > start else 0 - author = self.get_author(air_name) - result["author"] = author case_results.append(result) summary_message["caseNum"] += 1 print("case 执行完毕，开始生成报告") @@ -484,26 +515,23 @@ class CustomAirTestCase(AirtestCase): print("报告已生成") return True - def run_case_by_Multi(self, device_list, case_name, log_level): + def run_case_by_Multi(self, device_list, case_name): """ 兼容性测试，case在每个机器上跑一遍 :param device_list: :param case_name: - :param log_level: :return: """ all_start = int(time.time() * 1000) p = Pool(len(device_list)) # 获取所有需要执行的用例集 script_list = self.get_cases_and_log(case_name, device_list) - #random.shuffle(script_list) print("任务列表：") print(script_list) for device in device_list: # 设置进程数和设备数一样 try: - p.apply_async(self.do_run_by_pool, args=(device, script_list, os.path.join(self.log_path, device), log_level)) - time.sleep(3) + p.apply_async(self.do_run_by_pool, args=(device, script_list, os.path.join(self.log_path, device))) except: pass p.close() @@ -514,3 +542,324 @@ class CustomAirTestCase(AirtestCase): CustomAirTestCase.summary_message["time"] = "%d分%d秒" % (m, s) for device in device_list: self.delWithLogToReportByDevice(script_list, device) + + def run_case_by_distri(self, device_list, case_name): + """ + 多进程跑case，将任务平均分给不同的设备，多进程跑，都跑完后，读取各case的log.txt 文件，获取case的开始结束时间信息 + :param device_list + :param case_name: + :return: + """ + all_start = int(time.time() * 1000) + # 获取所有需要执行的用例集 + script_list = self.get_all_dir(case_name) + device_count = len(device_list) + #把任务分配给不同的设备，分布式跑就是不同机器跑不同任务最终完成所有任务 + case_list = self.assign_tasks(script_list, device_count) + print("任务列表：") + print(case_list) + # 记录case 及脚本对应关系 + case_dict = {} + #设置进程数和设备数一样 + p = Pool(device_count) + for i in range(device_count): + run_device = device_list[i] + cases = case_list[i] + case_dict[run_device] = cases + try: + p.apply_async(self.do_run_by_pool, args=(run_device, cases, self.log_path)) + except: + pass + p.close() + p.join() + print("all SubProcesses done") + seconds = (int(time.time() * 1000) - all_start) /1000 + m, s = divmod(seconds, 60) + CustomAirTestCase.summary_message["time"] = "%d分%d秒" % (m, s) + self.delWithLogToReport(script_list, case_dict) + + def analysis_air_file(self, case_name, case_path, new_air_name): + """ + 解析需要执行的air文件，将场景和场景之间隔开 + :param case_name: 需要分开场景的air文件 + :return: + """ + case_name_list = [] + file_name = case_path + os.sep + case_name + '.py' + pyfile = open(file_name, 'r', encoding='utf-8') + lines = pyfile.readlines() + for line in lines: + line = line.replace(" ", "").replace("\n", "") + if re.match("^场景", line): + line = line.replace("\\", "").replace("/", "").replace(":", "").replace("*", "").replace("?", "").replace("\"", "").replace("<", "").replace(">", "").replace("|", "") + if line in new_air_name: + line = line + str(random.randint(1, 500)) + str(random.choice("abcdefghijklmnopqrstuvwxyz")) + case_name_list.append(line) + pyfile.close() + """ + 如果含有多条(>1)场景，则对场景进行代码块划分 + """ + if len(case_name_list) > 1: + i = 0 + header_file = open(case_path + os.sep + 'header.py', 'w', encoding='utf-8') + for line in lines: + if re.match("^场景", line.replace(" ", "").replace("\n", "")): + new_file = open(case_path + os.sep + case_name_list[i] + '.py', 'w', encoding='utf-8') + new_file.write(line) + new_file.close() + i += 1 + else: + if i == 0: + header_file.write(line) + else: + new_file = open(case_path + os.sep + case_name_list[i-1] + '.py', 'a+', encoding='utf-8') + new_file.write(line) + new_file.close() + header_file.close() + new_air_name.extend(case_name_list) + return case_name_list, new_air_name + else: + case_name_list = [] + if case_name in new_air_name: + case_name = case_name + str(random.randint(1, 500)) + str(random.choice("abcdefghijklmnopqrstuvwxyz")) + case_name_list.append(case_name) + new_air_name.extend(case_name_list) + return case_name_list, new_air_name + + def merge_new_file(self, case_list): + """ + 将公共文件和场景文件合并成一个新的air文件 + :param case_list: + :return: + """ + new_case_list = [] + new_air_name = [] + case_scenario_name = {} + for i in range(len(case_list)): + case_hash = {} + air_name = case_list[i]["air_name"] + air_path = case_list[i]["air_path"] + module_name = case_list[i]["module"] + case_hash["run_case"] = air_name + case_hash["module"] = module_name + case_name_list, new_air_name = self.analysis_air_file(air_name, air_path, new_air_name) + if len(case_name_list) > 1: + case_hash["scene_run_cases"] = case_name_list + for j in range(len(case_name_list)): + case_scenario_name[case_name_list[j]] = air_name + if not os.path.exists(air_path): + os.mkdir(air_path) + header_file = open(air_path + os.sep + 'header.py', 'r', encoding='utf-8') + header_lines = header_file.readlines() + header_file.close() + new_file = open(air_path + os.sep + case_name_list[j] + '.py', 'r', encoding='utf-8') + new_file_lines = new_file.readlines() + last_line = new_file_lines[-1] + if re.match("^[\"]+$", last_line): + new_file_lines = new_file_lines[:-1] + new_file.close() + dir_name = self.case_path + os.sep + module_name + os.sep + case_name_list[j] + ".air" + if not os.path.exists(dir_name): + os.mkdir(dir_name) + new_air = open(dir_name + os.sep + case_name_list[j] + '.py', 'w', encoding='utf-8') + new_air.writelines(header_lines) + for line in new_file_lines: + new_air.write(line) + new_air.close() + os.remove(air_path + os.sep + case_name_list[j] + '.py') + os.remove(air_path + os.sep + 'header.py') + new_case_list.append(case_hash) + return new_case_list, new_air_name, case_scenario_name + + def merge_run_result(self, run_case_list, case_result, summary_message): + """ + 将场景执行结果合并，确定最后场景执行的最后状态，成功or失败 + :return: + """ + new_case_result = [] + """ + 遍历跑的所有用例，包括拆分出来的所有场景 + 判断每一个list中是否存在scene_run_cases， + 如果存在，则一个接口中有多个场景，遍历scene_run_cases，去case_result中找执行的结果，进行合并 + 如果不存在，则将执行结果赋值到新的结果中 + """ + count = 0 + summary_message["result"] = True + for i in range(len(run_case_list)): + new_dict_result = {} + json_case = run_case_list[i] + if 'scene_run_cases' in json_case: + time = 0 + new_dict_result["result"] = True + scene_names = json_case["scene_run_cases"] + new_dict_result["name"] = json_case["run_case"] + # 遍历scene_run_cases + break_flag = False + for m in range(len(scene_names)): + air_name = scene_names[m] + for j in range(len(case_result)): + dict_case = case_result[j] + if air_name == dict_case["name"]: + new_dict_result["author"] = dict_case["author"] + time = float(time) + float(dict_case["time"]) + if dict_case["result"] == False: + new_dict_result["result"] = False + count += 1 + break_flag = True + summary_message["result"] = False + break + if break_flag: + break + new_dict_result["time"] = time + new_case_result.append(new_dict_result) + else: + air_name = json_case["run_case"] + for j in range(len(case_result)): + dict_case = case_result[j] + if air_name == dict_case["name"]: + if dict_case["result"] == False: + count += 1 + new_case_result.append(dict_case) + break + summary_message["caseNum"] = len(run_case_list) + summary_message["passNum"] = len(run_case_list) - count + return new_case_result, summary_message + + def merge_log_txt(self, run_case_list, static_root, lang, plugin, report_dir, case_image_dir): + """ + 将log.txt内容合并 + :param run_case_list: + :return: + """ + for i in range(len(run_case_list)): + json_case = run_case_list[i] + module_name = json_case["module"] + if 'scene_run_cases' in json_case: + air_name = json_case["run_case"] + script = self.case_path + os.sep + module_name + os.sep + air_name + ".air" + log_root = "log" + os.sep + air_name + air_log_path = self.log_path + os.sep + air_name + if not os.path.exists(air_log_path): + os.mkdir(air_log_path) + new_log = open(self.log_path + os.sep + air_name + os.sep + 'log.txt', 'w', encoding='utf-8') + scene_run_cases = json_case["scene_run_cases"] + for j in range(len(scene_run_cases)): + sub_air_name = scene_run_cases[j] + try: + sub_log = open(self.log_path + os.sep + sub_air_name + os.sep + 'log.txt', 'r', encoding='utf-8') + lines = sub_log.readlines() + if len(lines) > 0: + json_line = json.loads(lines[0]) + total_time = str(json_line["time"]) + if "start_time" in json_line["data"]: + start_time = json_line["data"]["start_time"] + end_time = json_line["data"]["end_time"] + else: + start_time = "1603779572.984517" + end_time = "1603779572.984517" + else: + total_time = "1603779572.984517" + start_time = "1603779572.984517" + end_time = "1603779572.984517" + new_log.write('{"tag": "function", "depth": 1, "time": %s, "data": {"name": "assert_equal", "call_args": {"first": "autotest", "second": "autotest", "msg": ""}, "start_time": %s, "ret": null, "end_time": %s}, "scene_name": "%s"}\n' % (total_time, start_time, end_time, str(sub_air_name))) + new_log.writelines(lines) + sub_log.close() + new_air_path = self.case_path + os.sep + module_name + os.remove(new_air_path + os.sep + sub_air_name + ".air" + os.sep + sub_air_name + ".py") + shutil.rmtree(new_air_path + os.sep + sub_air_name + ".air") + except Exception as e: + print("mergeLogTxt: ", e) + new_air_path = self.case_path + os.sep + module_name + os.remove(new_air_path + os.sep + sub_air_name + ".air" + os.sep + sub_air_name + ".py") + shutil.rmtree(new_air_path + os.sep + sub_air_name + ".air") + new_log.close() + output_file = self.log_path + os.sep + air_name + os.sep + "log.html" + report.main(log_root, static_root, script, lang, plugin, report_dir, case_image_dir, output_file) + + def run_by_scenario(self, module_name, case_name, scenario_name): + case_results = [] + """ + 按照一条用例中的场景执行 + :return: + """ + case_path = self.case_path + os.sep + module_name + os.sep + case_name + ".air" + case_name_list = self.analysis_air_file(case_name, case_path, []) + for i in range(len(case_name_list)): + if scenario_name in case_name_list[i]: + scenario_name = case_name_list[i] + script = self.case_path + os.sep + module_name + os.sep + scenario_name + ".air" + air_path = self.case_path + os.sep + module_name + os.sep + scenario_name + ".air" + if not os.path.exists(air_path): + os.mkdir(air_path) + header_file = open(case_path + os.sep + 'header.py', 'r', encoding='utf-8') + header_lines = header_file.readlines() + header_file.close() + new_file = open(case_path + os.sep + scenario_name + '.py', 'r', encoding='utf-8') + new_file_lines = new_file.readlines() + last_line = new_file_lines[-1] + if re.match("^[\"]+$", last_line): + new_file_lines = new_file_lines[:-1] + new_file.close() + dir_name = self.case_path + os.sep + module_name + os.sep + scenario_name + ".air" + if os.path.isdir(dir_name): + new_air = open(dir_name + os.sep + scenario_name + '.py', 'w', encoding='utf-8') + new_air.writelines(header_lines) + for line in new_file_lines: + new_air.write(line) + new_air.close() + for j in range(len(case_name_list)): + os.remove(case_path + os.sep + case_name_list[j] + '.py') + os.remove(case_path + os.sep + 'header.py') + summary_message = {} + summary_message["caseNum"] = 0 + summary_message["passNum"] = 0 + fp = open(self.runtime_log, 'w+', encoding='utf-8') + # 创建日志 + log = self.create_log(self.log_path, scenario_name) + output_file = os.path.join(log, 'log.html') + # global args + args = Namespace(device=None, log=log, recording=None, script=script) + start = int(time.time() * 1000) + try: + run_script(args, AirtestCase) + summary_message["passNum"] += 1 + except: + pass + finally: + end = int(time.time() * 1000) + author = self.get_author(scenario_name, self.case_path + os.sep + module_name) + fp.write(scenario_name + '\t' + str(start) + '\t' + str(end) + '\t' + author + '\n') + rpt = report.LogToHtml(script, log) + report_dir = '../../report/report/' + case_image_dir = '../../air_case' + rpt.report("log_template.html", report_dir, case_image_dir, output_file=output_file) + result = {} + result["name"] = scenario_name + result["result"] = rpt.test_result + result["time"] = (end - start) / 1000 if end > start else 0 + case_results.append(result) + summary_message["caseNum"] += 1 + self.doReport(case_results, summary_message, 'summary.html') + os.remove(dir_name + os.sep + scenario_name + ".py") + shutil.rmtree(dir_name) + print("报告已生成") + return True + + def insert_api_path_to_cloud(self, case_list): + for i in range(len(case_list)): + every_case = case_list[i] + + + + + + + + + + + + + + + diff --git a/common/rw.py b/common/rw.py index cc52d19dedaf338c318711c228c1b43b7930933c..0938a40cfec2ee9271c8250450ee9ef0cf4362b7 100644 --- a/common/rw.py +++ b/common/rw.py @@ -8,7 +8,7 @@ curpath = os.path.dirname(os.path.realpath(__file__)) # 数据读入和写入文件 class Rw: def w_token(self, enc_user_id='u779700044448', env='on'): - result = dbOP().selectSql('select_user_token', [enc_user_id]) + result = dbOP().selectSql('select_user_token', [enc_user_id], "meitun_db") token = result[0][0] dict = {} token_value = {} @@ -23,12 +23,11 @@ class Rw: yaml.dump(dict, f, Dumper=yaml.RoundTripDumper) return token - def r_token(self, enc_user_id='u779700044448', env='on'): yamlpath = os.path.join(curpath, "data") file_value = open(yamlpath, 'r') result = yaml.load(file_value.read(), Loader=yaml.Loader) - if result != None: + if result is not None: key = enc_user_id + "_" + env if key in result: return result[key] diff --git a/data/hosts b/data/hosts index 5ee0396ca4a9dd5d6dbd09c9d683bf5eb7563e5f..53b4a8f8be9d9462bb8d5d8ac841f9384cb69f3a 100644 --- a/data/hosts +++ b/data/hosts @@ -1,18 +1,11 @@ -# dev -# dev + 172.16.10.203 api.babytree-dev.com 172.16.10.203 api-test11.babytree-test.com 172.16.10.203 api.test11.babytree-fpm.com 172.16.10.203 api.babytree.com -10.88.9.88 config.meitun.com copy.meitun.com -10.54.17.151 sita-h5.meitun.com -10.54.17.151 sita-cu.meitun.com -10.54.11.80 jenkins.baobaoshu.com atms.baobaoshu.com cloud.baobaoshu.com - - -10.88.7.8 fastdfs1.mt.com img11.meitun.com img01.meituncdn.com -10.88.7.8 fastdfs2.mt.com img12.meitun.com img02.meituncdn.com +# online +10.54.11.80 idb.baobaoshu.com 10.54.11.80 grafana.baobaoshu.com 10.54.11.80 zabbix.baobaoshu.com 10.54.11.80 cacti.baobaoshu.com @@ -21,58 +14,12 @@ 10.54.11.80 cmdb.baobaoshu.com 10.54.11.80 apollo.baobaoshu.com muse.baobaoshu.com 10.54.11.80 splunk.baobaoshu.com -192.168.24.30 dbm.mt.com -192.168.24.30 dbs1.mt.com - - -192.168.24.30 redisdb1.mt.com redisdb2.mt.com redis.mobile.db01.mt.com rediscache1.mt.com rediscache2.mt.com rediscache3.mt.com -192.168.24.46 mqmaster.mt.com -192.168.24.47 mqslave01.mt.com - -10.88.9.166 zk.mt.com - -10.54.11.80 ucmweb.baobaoshu.com - -172.16.9.154 webview.test9.dev.babytree-inc.com -172.16.9.154 test11.dev.babytree-inc.com -172.16.10.203 test11.babytree-dev.com test11.babytree-fpm.com m.test11.babytree-test.com test11.babytree-test.com test19.babytree-test.com webview.test9.dev.babytree-inc.com -10.54.17.151 sita-live.meitun.com -10.88.9.118 kafka.mt.com -10.88.7.11 pkg.baobaoshu.com 172.16.10.203 test100.babytree-dev.com g.babytree-dev.com 122.9.41.244 gerrit.babytree-inc.com 10.54.17.153 localproxy.baobaoshu.com 192.168.24.43 gerrit.mtmm.com -192.168.24.43 gerrit.baobaoshu.com - -0.0.0.0 account.jetbrains.com -10.54.11.80 idb.baobaoshu.com -10.54.17.153 sit-backend.meitunmama.com -10.54.17.153 sit-openapi.meitun.com -180.168.13.174 backend.meitunmama.com -10.54.17.153 sit-m.meitun.com -10.54.17.153 sit-static.meitun.com -10.54.17.153 sit-static.meituncdn.com -10.54.17.153 static.meitun.com -10.54.17.153 static.meituncdn.com -47.97.216.230 m.meitun.com -10.88.17.43 pre-backend.meitunmama.com -172.16.9.154 pack.babytree-inc.com -# 线上 -117.121.137.17 jumper.meitunmama.com -192.168.60.26 ops.baobaoshu.com -192.168.60.26 falcon.baobaoshu.com -115.159.253.118 ppt.baobaoshu.com -10.50.80.66 oneops.baobaoshu.com -10.50.80.66 ssv.baobaoshu.com -10.88.9.204 im.meitun.com -10.50.253.100 workflow.meitunmama.com -172.16.9.163 space.babytree-inc.com -10.88.17.43 pre-m.meitun.com -10.88.17.43 pre-openapi.meitun.com -10.54.11.80 mock.baobaoshu.com -10.54.11.80 mantis.baobaoshu.com -10.54.11.80 testportal.baobaoshu.com \ No newline at end of file +10.54.50.90 sso.baobaoshu.com +8.131.247.52 docp.plt.babytree-inc.com \ No newline at end of file diff --git a/data/idbSet b/data/idbSet index cfbebdc6f7619b460e55f5ef425165b77763c89f..8cf1f2dd2d7ba04ed03c8ee09eace12837f5f7b8 100644 --- a/data/idbSet +++ b/data/idbSet @@ -1,198 +1,97 @@ user: - live: - - 9 - - 4 - - 310 - pre: - - 9 - - 2 - - 307 + live: 6ea032c10ef24b10aa7fcfe5424446afin01 + pre: 6ea032c10ef24b10aa7fcfe5424446afin01 health: - live: - - 35 - - 4 - - 165 - pre : - - 35 - - 2 - - 163 + live: 6013c13418a245b9866e9cdec92ff9b9in01 + pre : 6013c13418a245b9866e9cdec92ff9b9in01 sit: health alimall: - live: - - 736 - - 4 - - 828 - pre : - - 736 - - 2 - - 826 + live: f4d539e7b8204a8890929320f2052d68in01 + pre : f4d539e7b8204a8890929320f2052d68in01 sit: alimall promotion: - live: - - 19 - - 4 - - 129 - pre: - - 19 - - 2 - - 58 + live: 9e33dd3e26a54c8caeaf871e873edb38in01 + pre: 9e33dd3e26a54c8caeaf871e873edb38in01 sit: promotion salesorder: - live: - - 6 - - 4 - - 134 - pre : - - 6 - - 2 - - 6 + live: 7f9c968b57084c0782aeb620e2a064b1in01 + pre : 7f9c968b57084c0782aeb620e2a064b1in01 sit: salesorder seller: - live: - - 7 - - 4 - - 144 - pre: - - 7 - - 2 - - 7 + live: 2888c1775daf4c60897073068b6c219ain01 + pre: 2888c1775daf4c60897073068b6c219ain01 sit: seller cms: - live: - - 22 - - 4 - - 142 - pre: - - 22 - - 2 - - 41 + live: 790afd094355416895ca39891c09c0d3in01 + pre: 790afd094355416895ca39891c09c0d3in01 sit: cms community: - live: - - 25 - - 4 - - 147 - pre: - - 25 - - 2 - - 37 + live: 790afd094355416895ca39891c09c0d3in01 + pre: 790afd094355416895ca39891c09c0d3in01 sit: community price: - live: - - 14 - - 4 - - 138 - pre: - - 14 - - 2 - - 51 + live: 6ea032c10ef24b10aa7fcfe5424446afin01 + pre: 6ea032c10ef24b10aa7fcfe5424446afin01 sit: price medical: - live: - - 766 - - 4 - - 1131 - pre: - - 766 - - 2 - - 1128 + live: 89a813f93c454db0a23c25f95c0d2e2cin01 + pre: 89a813f93c454db0a23c25f95c0d2e2cin01 sit: medical bcoin: - live: - - 717 - - 4 - - 750 - pre: - - 717 - - 2 - - 747 + live: f4d539e7b8204a8890929320f2052d68in01 + pre: f4d539e7b8204a8890929320f2052d68in01 sit: bcoin edu: - live: - - 727 - - 4 - - 794 - pre: - - 727 - - 2 - - 792 + live: 8e7f2572f92e49f4b0061f75682470eain01 + pre: 8e7f2572f92e49f4b0061f75682470eain01 sit: edu account: - live: - - 62 - - 4 - - 293 - pre: - - 62 - - 2 - - 291 + live: 2888c1775daf4c60897073068b6c219ain01 + pre: 2888c1775daf4c60897073068b6c219ain01 sit: account finance: - live: - - 10 - - 4 - - 136 - pre: - - 10 - - 2 - - 139 + live: 6013c13418a245b9866e9cdec92ff9b9in01 + pre: 6013c13418a245b9866e9cdec92ff9b9in01 sit: finance socialec: - live: - - 762 - - 4 - - 1079 - pre: - - 762 - - 2 - - 1077 + live: 89a813f93c454db0a23c25f95c0d2e2cin01 + pre: 89a813f93c454db0a23c25f95c0d2e2cin01 sit: socialec item: - live: - - 8 - - 4 - - 143 - pre: - - 8 - - 2 - - 8 + live: 2888c1775daf4c60897073068b6c219ain01 + pre: 2888c1775daf4c60897073068b6c219ain01 sit: item new_wms: - live: - - 763 - - 4 - - 1089 - pre: - - 763 - - 2 - - 1086 + live: 89a813f93c454db0a23c25f95c0d2e2cin01 + pre: 89a813f93c454db0a23c25f95c0d2e2cin01 sit: new_wms distribution: - live: - - 67 - - 4 - - 312 - pre: - - 67 - - 2 - - 315 - sit: new_wms + live: 8e7f2572f92e49f4b0061f75682470eain01 + pre: 8e7f2572f92e49f4b0061f75682470eain01 + sit: distribution + +supplier: + live: 790afd094355416895ca39891c09c0d3in01 + sit: supplier +local: + live: pc-2zerh8cqy748e33i8 + sit : b9e5fbff-08e9-11ed-866f-00163e324a72 diff --git a/data/msg b/data/msg index 1c773c72816d034ef413d6599b62236e996eb8e1..e5a0b6ebc82d429bda9d6ce6fe209851aff43827 100644 --- a/data/msg +++ b/data/msg @@ -1,4 +1,4 @@ "dingding_msg": -- +- 59d455293168352cecfaa4fb67f2568f3fa54453a2fdb87ce9817c316dc41b57 diff --git a/data/spd3.0/data b/data/spd3.0/data new file mode 100644 index 0000000000000000000000000000000000000000..5cbda92db82ed7c1381afc4cda6f4acd4920eebd --- /dev/null +++ b/data/spd3.0/data @@ -0,0 +1,9 @@ +# 登录外网（主数据平台）系统 +"VerifyCode_url": "/test2api/oauthService/auth/getVerifyCode" +login_data: {"orderCode": "10200512100243412"} +login_contentType: "application/json" +login_checkDict: {"rtn_code": "0000001"} + + +"login_enc_user_id": "国药集团湖北分公司mQDwR7" +"login_url": "/test2api/oauthService/auth/getVerifyCode" \ No newline at end of file diff --git a/data/spd3.0/message b/data/spd3.0/message new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/data/spd/sql b/data/spd3.0/sql similarity index 100% rename from data/spd/sql rename to data/spd3.0/sql diff --git a/data/sql b/data/sql index 523b2a063f470c4251c70131b17f69a7a473e403..55789897be35bddc2f676399c4b3425e72a7825d 100644 --- a/data/sql +++ b/data/sql @@ -1,7 +1,11 @@ -"course": -- health -- select * from health.course where status=2 and type=0 ORDER BY create_time DESC LIMIT 10; +"select_user_token": +- user +- select token from user.uc_user_token where enc_user_id=%s; -"prc_prom_price": -- cloud -- select * from access_log where id = %s; \ No newline at end of file +"exp_expert": +- medical +- SELECT id,expert_name,base_service_count,service_count from exp_expert where deleted=%s and status=%s; + +"select_memberPrivilegeId": +- user +- SELECT id ,enc_user_id,privilege_type FROM uc_member_privilege WHERE left_times>0 and status=1 AND privilege_type IN (5,12,9,2,10,11) AND start_time NOW() AND enc_user_id IN (SELECT enc_user_id FROM uc_user_member WHERE final_end_time >NOW() AND level_type_code=001) order by id desc limit 1 \ No newline at end of file diff --git a/distribute.py b/distribute.py index 1f5436333da8f0cdbab080fb5451abecf01d9882..9955fac3f87ab76d3af50feb9dcc67e60eda9b01 100644 --- a/distribute.py +++ b/distribute.py @@ -9,6 +9,7 @@ from bs4 import BeautifulSoup from random import shuffle import datetime import pypinyin +import hashlib def exchange(word): @@ -23,6 +24,63 @@ def exchange(word): return s +def get_message(case_path, case_name): + # 从注释中获取某个文件的 case tag 信息 + tags = [] + pyfile = open(case_path + os.sep + case_name + '.py', 'r', encoding='utf-8') + lines = pyfile.readlines() + for line in lines: + if 'case_tag' in line: + line = line.split('case_tag')[-1] + # 对不规范的写法做一些处理，如中文分号, 中文逗号，多空格等。。 + line = re.sub(' ', '', line) + line = line.replace('，', ',').replace(':', '').replace('：', '') + line = line.strip().strip('\n') + tags = line.split(',') + pyfile.close() + return tags + + +def get_all_dir(case_name, case_path): + """ + :return: 获得需要执行的所有air的文件夹，同时创建单个log目录 + """ + case_list = [] + for dirs in os.listdir(case_path): + isdir = os.path.join(case_path, dirs) + if os.path.isdir(isdir) and isdir.endswith(".air"): + air_name = dirs.replace('.air', '') + if 'all' in case_name or air_name in case_name: + # script = os.path.join(case_path, isdir) + case_list.append(air_name) + return case_list + + +def get_case_tag_list(case_path, cases): + """ + 遍历case目录下的文件，从文件中获取case tag,加入列表中 + 如果想同时满足两个条件，用#分割 + """ + tagList = cases.split('#') + env = os.environ['ENV'] + case_list = [] + for f in os.listdir(case_path): + script = os.path.join(case_path, f) + air_name = f.replace('.air', '') + case_tags = get_message(script, air_name) + flag = False + for con in tagList: + conList = con.split(',') + if list(set(case_tags) & set(conList)): + flag = True + else: + flag = False + break + if flag and (env in case_tags or env in ('sit', 'sita')): + case_list.append(air_name) + return case_list + + def get_dir_exist(path, div_num): """ 判断报告文件夹是否存在 @@ -33,7 +91,6 @@ def get_dir_exist(path, div_num): return False return True - def merge_report(div_num, report_path): """ 合并报告 @@ -81,17 +138,17 @@ def merge_report(div_num, report_path): if status == '成功': html = ''' - %s + %s %s %s - ''' % (case_name, status, run_time) + ''' % (case_name, case_name, status, run_time) else: html = ''' - %s + %s %s %s - ''' % (case_name, status, run_time) + ''' % (case_name, case_name, status, run_time) lines.append(html) #print(html) pass_rate = round(succ_cases*100/total_cases, 2) @@ -159,7 +216,10 @@ def get_mess_from_report(report_path): succ_cases = int(tds[1].getText()) time_str = tds[2].getText() time_str = time_str.replace('分', 'm').replace('秒', 's') - pass_rate = round(succ_cases * 100 / total_cases, 2) + if int(total_cases) != 0: + pass_rate = round(succ_cases * 100 / total_cases, 2) + else: + pass_rate = 0.00 htmlfile.close() return total_cases, succ_cases, time_str, pass_rate @@ -207,7 +267,7 @@ def call_back_cloud(runenv, pool_name, build_num, start, end, job_url, build_use status = 'success' else: status = 'fail' - job_url = job_url + str(build_num) + '/artifact/report/summary.html' + url = "http://cloud.baobaoshu.com/cloud/buildautotest?type=" + \ runenv + "&buildid=" + str(build_num) + "&pool=" + pool_name + \ "&codeversion=" + str(newrev) + "&lastcversion=" + str(oldrev) + \ @@ -238,49 +298,134 @@ def call_back_muse(deployid, cbtoken, build_user, pass_rate, job_url, build_num) print('非远程触发') pass +def call_back_gitool(deployid, cbtoken, build_user, pass_rate, job_url, build_num,env_t): + """ + 回调gitool + :return: + """ + print("call back gitool") + + if deployid != 'deployid' and cbtoken == 'cbtoken' and build_user == 'SYSTEM': + timestamp = str(int(time.time())) + data = "gitool_autotest_api_token(- - #)" + timestamp + + sign_md5 = hashlib.md5() + sign_md5.update(data.encode(encoding='utf-8')) + data = sign_md5.hexdigest() + verify_str = data + "_" + timestamp + if pass_rate == 100.0: + status = 'pass' + else: + status = 'failed' + if env_t == 'on': + url = 'http://gitool.plt.babytree-inc.com/gitool/update_online_autotest_result?' + elif env_t == 'pre': + url = 'http://gitool.plt.babytree-inc.com/gitool/update_pre_autotest_result?' + elif env_t == 'sit': + url = 'http://gitool.plt.babytree-inc.com/gitool/update_test_autotest_result?' + + url = url + "branch_id="+str(deployid)+"&result="+str(status)+"&result_url="+str(job_url)+"&detail_result=&"+"verify_str="+str(verify_str) + print(url) + response = get(url) + print("回调gitool返回结果") + print(response.content.decode()) + else: + print('非远程触发') + pass + if __name__ == '__main__': start = datetime.datetime.now().strftime('%Y%m%d%H%M%S') print('start') case_path = os.path.abspath(".") + os.sep + 'air_case' report_path = os.path.abspath(".") + os.sep + 'report' + # 第一个参数，case执行类型 + tag = sys.argv[1] + # 想运行多个tag 用逗号分割。 想运行同时满足两种tag的用&号连接 + cases = sys.argv[2] + # 第3个参数，日志数据等级 + log_level = sys.argv[3] + # 第4个参数，子任务个数，或者 是 app运行模式 + num = sys.argv[4] + # 第5个参数，子任务名或者 设备uid + JobOrDevice = sys.argv[5] + # pool名 + pool_name = sys.argv[6] + runenv = sys.argv[7] + job_name = sys.argv[8] + build_num = sys.argv[9] + job_url = sys.argv[10] + build_user = exchange(sys.argv[11]) - pool_name = sys.argv[1] - runenv = sys.argv[2] - job_name = sys.argv[3] - build_num = sys.argv[4] - job_url = sys.argv[5] - build_user = exchange(sys.argv[6]) + oldrev = sys.argv[12] + newrev = sys.argv[13] - oldrev = sys.argv[7] - newrev = sys.argv[8] + deployid = sys.argv[14] + cbtoken = sys.argv[15] + if runenv == 'autotestpreid': + env_t = 'pre' + elif runenv == 'autotestonlineid': + env_t = 'on' + elif runenv == 'autotestsitaid': + env_t = 'sita' + else: + env_t = 'sit' + os.environ['ENV'] = env_t - Jobs = ['AutoTest_Pregnancy_First', 'AutoTest_Pregnancy_Personal', 'AutoTest_Pregnancy_Community', \ - 'AutoTest_Pregnancy_Contents', 'AutoTest_Pregnancy_Tools/'] - for i in range(5): - cmd = 'rd /s /q report\\report_' + str(i+1) + # 如果num是 s,m,d 表示是运行app 用例 + if num in ('s', 'm', 'd'): + cmd = 'python runner_app.py ' + JobOrDevice + ' ' + num + ' ' + tag + ' ' + cases + ' ' + log_level os.system(cmd) - url = 'http://192.168.24.100:8080/view/Tools/job/' + Jobs[i] + '/buildWithParameters?token=123456' - print(url) - requests.get(url) - # 等待1分钟 - time.sleep(2400) - # 判断报告传输是否完成 - while True: - is_done = get_dir_exist(report_path, 5) - if is_done: - total_cases, succ_cases, run_time, pass_rate = merge_report(5, report_path) - break + total_cases, succ_cases, run_time, pass_rate = get_mess_from_report(report_path) + else: + num = int(num) + # 如果将任务数设置为1并且子任务名等于job名，就不分任务到子job，直接本机跑 + if num != 1 or JobOrDevice != job_name: + case_list = cases.split(',') + if tag == 'tag': + case_list = get_case_tag_list(case_path, cases) + if tag == 'all': + case_list = get_all_dir(case_list, case_path) + shuffle(case_list) + length = len(case_list) + if length >= num: + div_num = num + else: + div_num = length + print(div_num) + for i in range(div_num): + cmd = 'rd /s /q report\\report_' + str(i+1) + os.system(cmd) + one_list = case_list[math.floor(i / div_num * length):math.floor((i + 1) / div_num * length)] + one_list_str = ",".join(one_list) + print(one_list_str) + url = 'http://jenkins.baobaoshu.com/view/Tools/job/' + JobOrDevice + '_' + str(i+1) + '/buildWithParameters?token=123456&tag=choose&cases=' + one_list_str + "&log_level=" + log_level + "&env=" + env_t + "&triger_job_name=" + job_name + print(url) + requests.get(url) + # 等待1分钟 + time.sleep(60) + # 判断报告传输是否完成 + while True: + is_done = get_dir_exist(report_path, div_num) + if is_done: + total_cases, succ_cases, run_time, pass_rate = merge_report(div_num, report_path) + break + else: + time.sleep(5) else: - time.sleep(5) - + run_url = str(job_url) + str(build_num) + os.sep + "artifact" + os.sep + "report" + os.sep + "summary.html" + cmd = 'python runner.py ' + tag + ' ' + cases + ' ' + log_level + ' ' + env_t + ' ' + run_url + os.system(cmd) + total_cases, succ_cases, run_time, pass_rate = get_mess_from_report(report_path) end = datetime.datetime.now().strftime('%Y%m%d%H%M%S') + # 回传数据到gitool + call_back_gitool(deployid, cbtoken, build_user, pass_rate, job_url, build_num, env_t) # 回传数据到muse - #call_back_muse(deployid, cbtoken, build_user, pass_rate, job_url, build_num) + call_back_muse(deployid, cbtoken, build_user, pass_rate, job_url, build_num) # 回传数据到atms call_back_atms(runenv, job_name, build_num, total_cases, pass_rate, run_time, pool_name, build_user) @@ -290,3 +435,4 @@ if __name__ == '__main__': if pass_rate != 100.0: sys.exit(1) + diff --git a/readme.txt b/readme.txt index a7254ea7a3f948f8890fc3a55d3045c44afda577..a262e73bf629d1f8ae0afe32f374db3c89385bff 100644 --- a/readme.txt +++ b/readme.txt @@ -1,54 +1,93 @@ 项目结构: -自动化用例的工程目录 - ----common 存放公共方法 - ----air_case 存放用例case - ----templates 存在模板报告 - ----report 存放case执行总报告及各用例报告 - ----log 存放case执行日志 - ----data 存放数据 - runner.py case执行调度入口 +autotest-airtest-web: + ---common 存放公共方法 + ---air_case 存放用例case + ---templates 存在模板报告 + ---report 存放case执行总报告及各用例报告 + ---log 存放case执行日志 + ---data 存放数据 + ---runner.py case执行调度入口 + ---distribute.py 任务分发及上传数据到云平台 +不方便准备环境的童鞋可以直接登录云编辑器，在云编辑器上直接开发用例，操作手册链接：http://space.babytree-inc.com/pages/viewpage.action?pageId=27535942 +如果有权限问题，请联系caiyubing解决 +一、环境准备: +1、python包安装: +要求： python要python3以上，pip版本要在20以上。使用python -V和pip -V查看各自版本 +将python安装环境配置到环境变量中 +详细安装文档参考http://space.babytree-inc.com/pages/viewpage.action?pageId=24940086，编写用例手册查看http://space.babytree-inc.com/pages/viewpage.action?pageId=24940840 -总工程执行方式: -python3 runner.py 参数1 参数2 参数3 参数4 参数5 -参数1: 设备id(多个用逗号分隔) -参数2：选择运行模式，s, m, d - s-> single 单设备运行，m-> multi 多设备运行(测兼容性相关，每个设备上都执行要执行的case）、d-> distribute多设备分布式运行(将case分布到不同的设备上跑，节省耗时) -参数3: case执行类型,all表示执行所有，choose表示选择性执行, tag表示按case级别执行任务 -参数4: 与第二个参数对应，如果参数2是all,参数3可传all(非空值都行)，参数2是choose, 参数3传要执行的case名称，多个case逗号分隔， - 参数2是tag，参数3传tag名,多个tag用逗号分割，如：P0,P1 -参数5: 设置日志级别，可选参数 WARN、DEBUG、INFO +2、安装chromedriver，后面跑web测试需要用到。 +直接下载chromedriver并添加路径 +http://chromedriver.storage.googleapis.com/index.html +下载和chrome及电脑系统对应版本的chromedriver +--mac添加到路径的方式是： +进入下载文件所在位置 +unzip chromedriver_mac64.zip +mv chromedriver /usr/local/bin +--windows添加到路径的方式是 +Windows 进入系统->高级设置->环境变量进行设置->选中path，点编辑，把chrome浏览器的路径(比如：C:\Users\Administrator\AppData\Local\Google\Chrome\Application)和chromedriver的路径加到path里。 +二、case编写 +可根据不同的情况选择拷贝不同的demo脚本。 +本地执行dubbo拷贝【dubbo-local-demo.air】文件 +openapi拷贝【openapi-demo.air】文件 +mapi get请求拷贝【httpget-demo.air】文件 +mapi post请求拷贝【httppost-demo.air】文件 +注意： + 1. 拷贝后修改文件名.air的文件名和.py的文件名保持一致 + 2. 请注意下方case_tag中新增pool名、taskCode、执行环境（sit/on/pre）等其他需要增加的tag -实例1： 单设备跑所有的case及埋点，同时设置日志级别为DEBUG： -python3 runner.py 60fbe8cc s all all DEBUG -实例2：多设备跑部分case,同时设置日志级别为WARN -python3 runner.py 60fbe8cc,b5384901 m choose demo WARN -实例3： -单设备跑P0的case -python3 runner.py 60fbe8cc s tag P0 DEBUG +三、case 执行： +执行某个tag的case并设置日志等级为DEBUG, tag在每个用例上的case_tag的后面取: +python runner.py tag 100086 DEBUG sit +执行case中的某个场景命令: +python runner.py sc 月嫂 babyCareSearch 传参sortType=1 DEBUG sit +说明: 月嫂 模块名 babyCareSearch(.air文件夹的名字) 传参sortType=1(场景的名字,支持模糊匹配,但是不能有空格) +多个casetag用英文逗号分割。 如果需要同时满足多种tag用#分割 +如python runner.py tag api#user-web DEBUG sit 表示执行同时满足api 且 user-web两个条件的case +python runner.py tag api#user-web,health-web 表示执行满足api 且 （user-web或者health-web）条件的case +DEBUG表示设置日志等级，可选参数有 +DEBUG，INFO，WARN +sit表示选择执行环境。可输入参数sit,on,pre +sit表示测试环境，on 表示线上环境, pre预生产环境 +具体case能否在各环境执行视case情况而定 +四、任务分发 +如果本地调试用二中的方式调用就行。 +如果需要快速执行完任务，把任务分发的几个不同的子job去执行就采用以下调度方式。子job需要自己创建 +python distribute.py %tag% %cases% %log_level% %num% %JobOrDevice% %pool_name% %run_env% %JOB_NAME% %BUILD_NUMBER% %JOB_URL% %BUILD_USER% %oldrev% %newrev% %deployid% %cbtoken% +如果不需要分发任务到其他子job，num传参数1，JobOrDevice传本job名 +#重要说明 +自动化case在sit,pre,on三个环境下执行。sit环境可以直接通过命令连接数据库。而pre,on环境需要从http://idb.baobaoshu.com/ 里去查询。 +我们封装的查询方法在 common/db/sql/sql.py里。登录账号及选择数据库，环境，服务器需要各业务线根据自己的需求去自主填写。 +即在common/db/sql/sql.py 里找到以下内容，填入对应值。 +driver.find_element_by_id('username').send_keys() +driver.find_element_by_name('password').send_keys() +#选择数据库,，括号里填入自己数据库的值 +Select(driver.find_element_by_id("database")).select_by_value() +#选择环境 +Select(driver.find_element_by_id("environment")).select_by_value() +#选择服务器 +Select(driver.find_element_by_id("server")).select_by_value() -环境相关问题： -1、判断手机是否是锁屏态时需要用到adb，所以要保证我们的环境变量里有adb。 -linux环境装完adb需要在环境变量里配置一下。 -python也需要配置环境变量，配置如下： -vim ~/.bash_profile 加上 -export PYTHON3=/usr/local/bin/ -export ADB=/Applications/AirtestIDE.app/Contents/MacOS/airtest/core/android/static/adb/mac/ -export PATH=$PATH:$PATHON3:$ADB -另外在终端里配置一下，使环境变量一直生效，不需要source -终端是zsh的话，加载的是 ~/.zshrc文件 -vim ~/.zshrc 最后，增加一行：source ~/.bash_profile -windows环境可按windows设置环境变量的方式设置。 +五、功能介绍 +> 支持美囤和北京数据库测试环境线上环境查询、美囤测试环境update和delete +例子: + 美囤调用: result_db = dbOP().selectSql('exp_expert', [0, 20]) + 北京调用: result_db = dbOP().selectSql('exp_expert', [0, 20], 'bj_db') -case相关问题： -1、如果case要分tag，可在写case的时候在代码里加上注释 case_tag:P0,checkList - 当选择按tag去跑用例，我们会按关键字case_tag去获取对应case的级别,多个tag 逗号分隔 +六、 如何进行代码review +> 代码提交到gerrit后,请通知团队的测试进行review +> review结果请写入到reply中 +若用例中掉了场景,则需要填写;用例XXXX(填上.air名)差场景:XXX、场景:XXX,并通知开发修改 +若case没有问题,则直接写review通过 +> + diff --git a/report/report/js/report.js b/report/report/js/report.js index 35c7070445abe5b3d77984748d575723c65778eb..068ea73a8684eeb97efd7b8634e86265684a271e 100644 --- a/report/report/js/report.js +++ b/report/report/js/report.js @@ -30,10 +30,10 @@ function StepPannel(data, root){ this.bindEvents() this.init_gallery() this.init_pagenation() - var steps = this.filterAssertSteps() + var steps = [].concat(this.original_steps) if(steps.length >0){ this.steps = steps - this.filterSteps($('.filter#assert')) + this.filterSteps($('.filter#all')) } else{ this.setSteps() } @@ -252,7 +252,8 @@ function StepPannel(data, root){ for(var i = start; i< end; i++){ var step = this.steps[i] var title = step.assert ? 'Assert: ' + step.assert : step.title - html += '
'.format(step.index) + + html += step.scene_name ? '
'+'%s'.format(step.scene_name) : '' +'
' + + '
'.format(step.index) + '%s.svg'.format(this.static, step.status, step.status) + '# %s'.format(step.index +1) + '%s'.format(title) + @@ -643,6 +644,7 @@ function getFormatTime(timestamp){ function getFormatDuration(delta) { // 格式化耗时， 格式为 0hr1min6s22ms + console.log(delta) ms = parseInt(delta % 1000) delta = parseInt(delta / 1000) s = delta % 60 @@ -650,7 +652,6 @@ function getFormatDuration(delta) { m = delta % 60 h = parseInt(delta/ 60) - msg = '' if(h == 0) if(m == 0) if(s==0) diff --git a/report/report/report.py b/report/report/report.py index aadfccb2c5cea36300821dc42fbe91febf0f59fb..4b31c0bd4158df8993a076b896f872fcbbcdab1c 100644 --- a/report/report/report.py +++ b/report/report/report.py @@ -112,6 +112,10 @@ class LogToHtml(object): def _translate_step(self, step, case_img_dir): """translate single step""" + scene_name = "" + if 'scene_name' in step: + scene_name = step["scene_name"] + name = step["data"]["name"] title = self._translate_title(name, step) code = self._translate_code(step, case_img_dir) @@ -120,18 +124,20 @@ class LogToHtml(object): traceback = self._translate_traceback(step) assertion = self._translate_assertion(step) + time = step["time"] + # set test failed if any traceback exists if traceback: self.test_result = False - translated = { "title": title, - "time": step["time"], + "time": time, "code": code, "screen": screen, "desc": desc, "traceback": traceback, "assert": assertion, + "scene_name": scene_name, } return translated @@ -250,10 +256,8 @@ class LogToHtml(object): else: image_path = os.path.abspath(value['_filepath'] or value['filename']) #arg["image"] = image_path - try: - arg["image"] = case_img_dir + image_path.split("air_case")[1].replace("\\", "/") - except: - arg["image"] = image_path + arg["image"] = case_img_dir + image_path.split("air_case")[1].replace("\\", "/") + if not value['_filepath'] and not os.path.exists(value['filename']): crop_img = imread(os.path.join(self.script_root, value['filename'])) else: @@ -505,6 +509,7 @@ def get_parger(ap): return ap +""" def main(args): # script filepath path, name = script_dir_name(args.script) @@ -519,7 +524,22 @@ def main(args): # gen html report rpt = LogToHtml(path, log_root, static_root, export_dir=export, script_name=name, lang=lang, plugins=plugins) rpt.report(HTML_TPL, output_file=args.outfile, record_list=record_list) +""" + +def main(log_root, static_root, script, lang, plugins, report_dir, case_image_dir, output_file): + # script filepath + #ap = get_parser() + path, name = script_dir_name(script) + record_list = [] + log_root = decode_path(log_root) or decode_path(os.path.join(path, LOGDIR)) + #static_root = args.static_root or STATIC_DIR + static_root = decode_path(static_root) + export = None + # gen html report + rpt = LogToHtml(path, log_root, static_root, export_dir=export, script_name=name, lang=lang, plugins=plugins) + rpt.report("log_template.html", report_dir, case_image_dir, output_file=output_file) + return rpt if __name__ == "__main__": import argparse diff --git a/report/summary.html b/report/summary.html index 412b5e3edf121a42252e4299a06efd9438a7ff64..cbab0dfbd92e109411fd8408fa0340b2f4885189 100644 --- a/report/summary.html +++ b/report/summary.html @@ -46,17 +46,17 @@ - - + + - + - +
  • 测试概要
用例总数
用例总数 成功数 运行用时 成功率
1 10分48秒0分0秒 100.0%
@@ -64,20 +64,18 @@ - + - - - + + - - - + +
  • 测试列表
用例名称 执行结果 执行时间(秒) 用例作者执行设备
demo
登录外网系统 成功48.868lihong0.1xiaohesheng
diff --git a/requirements.txt b/requirements.txt index 0b50a3bfefaf470e9bd4d0348e677b2da1636cb0..78bbca323bc62ed8d12c75a4252ec8abb895dfd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,7 +51,7 @@ python-dateutil==2.8.1 python-gitlab==1.15.0 pytz==2019.3 pywinauto==0.6.3 -PyYAML==3.13 +PyYAML==5.3.1 redis==3.3.11 requests==2.22.0 ruamel.yaml==0.16.10 diff --git a/runner.py b/runner.py index 851ab7ccfacbbffcc8c2ef4f5fc9b6ec40cc2acb..cf474acb616431c37ad5a24a3463da8341f8305a 100644 --- a/runner.py +++ b/runner.py @@ -1,219 +1,90 @@ -# -*- encoding=utf-8 -*- +# -*- encoding=utf8 -*- import os import sys +import platform +import shutil import common.run_case_conditions as run import common.case_tag_get as case_tag_get -import random -import time -import requests -import json -import platform - curPath = os.path.abspath(os.path.dirname(__file__)) rootPath = os.path.split(curPath)[0] sys.path.append(rootPath) -def dingding_send(content): - """ - 报错的用例发钉钉群 - :param content: - :return: - """ - url = 'https://oapi.dingtalk.com/robot/send?access_token=d9e673ded1ab61ee6a631333a3d80b4291684e3adf61169ab6c1bb83d375e26d' - pagrem = { - "msgtype": "text", - "text": { - "content": content - }, - "at": { - "atMobiles": [ - - ], - "isAtAll": True # 是否@所有人，默认否 - } - } - headers = { - 'Content-Type': 'application/json' - } - response = requests.post(url, data=json.dumps(pagrem), headers=headers) - print(response.text) - return response.text - -def check_phone_locked(): - for device_id in devices_list: - is_ok = os.system('adb -s ' + device_id + ' get-state') - print("is_ok: " + str(is_ok)) - if is_ok != 0: - if '5555' in device_id: - os.system('adb connect ' + device_id) - is_ok = os.system('adb -s ' + device_id + ' get-state') - if is_ok != 0: - devices_list.remove(device_id) - else: - if device_id != 'bb294ac8': - devices_list.remove(device_id) - if "AutoTest_" in curPath: - dingding_send("设备检查:" + device_id + "离线啦, 快去看看") - else: - try: - for i in range(3): - r = os.popen('adb -s ' + device_id + ' shell dumpsys window policy') - stdout = r.read() - r.close() - if 'mShowingLockscreen=true' in stdout or 'mScreenOnEarly=false' in stdout: - if 'mScreenOnEarly=false' in stdout: - os.system('adb -s ' + device_id + ' shell input keyevent 26') - os.system('adb -s ' + device_id + ' shell input keyevent 224') - if device_id in ['0815f81aab021502', 'WTKDU16C07003266']: - os.system('adb -s ' + device_id + ' shell input swipe 300 1500 300 300') - else: - os.system('adb -s ' + device_id + ' shell input swipe 300 1000 300 500') - os.system('adb -s ' + device_id + ' shell input keyevent 3') - check_battery(device_id) - except: - pass - print("device_list:") - print(devices_list) - - -def check_battery(device_id): - """ - 检查电池信息 - :return: - """ - reset_cmd = 'adb -s ' + device_id + ' shell dumpsys battery reset' - os.system(reset_cmd) - time.sleep(1) - check_cmd = 'adb -s ' + device_id + ' shell dumpsys battery' - r = os.popen(check_cmd) - stdout = r.read() - r.close() - level = stdout.split('level')[1].split('scale')[0] - level = level.replace('\n', '').replace('\r', '').replace(': ', '') - - if int(level) >= 90: - print(level) - print('adb -s ' + device_id + ' shell dumpsys battery set status 1') - os.system('adb -s ' + device_id + ' shell dumpsys battery set status 1') - else: - if int(level) < 6: - devices_list.remove(device_id) - if "AutoTest_" in curPath: - dingding_send("设备检查:" + device_id + "电量不足6%啦，快去看看") - print(level) - print('adb -s ' + device_id + ' shell dumpsys battery set status 2') - os.system('adb -s ' + device_id + ' shell dumpsys battery set status 2') - - -def get_file(path): - """ - 获取解压出来得文件名 - :return: - """ - list = [] - for dirpath, dirnames, filenames in os.walk(path): - for f in filenames: - if f.endswith('.apk'): - list.append(filenames) - return list - - -def download(url=""): - """ - 拉取主干最新的包 - :return: - """ - del_cmd = 'del temp\*.* /s /q >nul' - os.system(del_cmd) - if url != "": - - dump_cmd = 'curl -u admin:YKNTJKLW9Y -O ' + url - print(dump_cmd) - p = os.popen(dump_cmd) - print(p.read()) - time.sleep(1) - os.popen('move *apk temp') - time.sleep(1) - else: - dump_cmd = 'curl -u admin:YKNTJKLW9Y http://pack.babytree-inc.com/view/%E5%AD%95%E8%82%B2%E5%AE%89%E5%8D%93/job/android_pregnancy_master/lastSuccessfulBuild/artifact/temp/*zip*/temp.zip -o apk.zip' - print("dump_cmd: ", dump_cmd) - unzip_cmd = 'unzip -o apk.zip' - p = os.popen(dump_cmd) - print(p.read()) - os.popen(unzip_cmd) - time.sleep(2) - - if __name__ == '__main__': - # 第一个参数设备ID - devices = sys.argv[1] - devices_list = devices.split(',') - # 第二个参数 选择单机或多机或多机分布式跑 - runType = sys.argv[2] - # 第三个参数 case 执行类型，'all', 'choose', 'tag' - caseType = sys.argv[3] - # 第四个参数要执行的caseName, 多个文件逗号分割 - caseName = sys.argv[4] - # 第五个参数，设置日志等级 - log_level = sys.argv[5] - # 复制hosts文件 + # 第一个参数 case 执行类型，'all', 'sc', 'tag' + caseType = sys.argv[1] + # 第2个参数要执行的caseName, 多个文件逗号分割 + caseName = sys.argv[2] + # 第3个参数，设置日志等级 + log_level = sys.argv[3] + log_level = log_level.lower() + #获取运行环境，写入环境变量 + env = sys.argv[4] + os.environ['ENV'] = env.lower() + job_url = "" + #判断传入过来的参数数量是否>5个，如果>5，则传过来的第5个参数为job链接 + if len(sys.argv) > 5: + job_url = sys.argv[5] + + + #复制hosts文件 if platform.system() == 'Windows': cmd = "xcopy /s /y data\hosts C:\Windows\System32\drivers\etc\ " else: cmd = 'mv data/hosts /etc/' os.system(cmd) - workspace = os.path.abspath(".") - # 检查锁屏 - check_phone_locked() - - if len(sys.argv) >= 7 and sys.argv[6] == 'download': - if len(sys.argv) > 7: - url = sys.argv[7] - download(url) - else: - download() case_path = os.path.join(workspace, 'air_case') log_path = os.path.join(workspace, 'log') runtime_log = os.path.join(log_path, 'runtime.txt') + if not os.path.exists(log_path): + os.makedirs('log') + if not os.path.exists(runtime_log): + os.system('type nul >log/run_time.txt') + print("workspace: " + workspace) print("air_case_path: " + case_path) print("air_log_path: " + log_path) - print("runType:" + runType) print("caseType:" + caseType) test = run.CustomAirTestCase(workspace, case_path, log_path, runtime_log, log_level) - - case_list = caseName.split(',') - if caseType == 'tag': - tag = sys.argv[4] - tagList = tag.split(',') - case_list = case_tag_get.get_case_tag_list(case_path, tagList) - if caseType == 'user': - tag = sys.argv[4] - case_list = case_tag_get.get_case_by_author(case_path, tag) - random.shuffle(case_list) - """ - if '个人主页_会客厅_首次进入' in case_list: - index = case_list.index('个人主页_会客厅_首次进入') - case_list[0], case_list[index] = case_list[index], case_list[0] - print("first case is : %s " % case_list[0]) - """ - if runType == 's': - test.run_case(devices_list[0], case_list) - print("执行程序里的exit(0)") - sys.exit(0) - print("执行后exit(0)") - elif runType == 'd': - if caseName == 'firstpage': - devices_list = devices_list[:3] - test.run_case_by_distri(devices_list, case_list, log_level) - print("执行程序里的exit(0)") - sys.exit(0) - print("执行后exit(0)") - else: - test.run_case_by_Multi(devices_list, case_list, log_level) - print("执行程序里的exit(0)") - sys.exit(0) - print("执行后exit(0)") + try: + if caseType == 'sc': + moduleName = sys.argv[2] + caseName = sys.argv[3] + sceName = sys.argv[4] + log_level = sys.argv[5] + log_level = log_level.lower() + # 获取运行环境，写入环境变量 + env = sys.argv[6] + os.environ['ENV'] = env.lower() + test.run_by_scenario(moduleName, caseName, sceName) + else: + case_list = caseName.split(',') + if caseType == 'tag': + tag = sys.argv[2] + case_list = case_tag_get.get_case_tag_list(case_path, tag) + run_case, case_list, case_scenario_name = test.merge_new_file(case_list) + test.run_case(run_case, case_list, job_url, case_scenario_name) + except Exception as e: + print("Exception:", e) + finally: + """ + 检查air_case中是否有多余的.py文件和场景文件，有就删除 + """ + dir_list = os.listdir(case_path) + for cur_file in dir_list: + path = os.path.join(case_path, cur_file) + if os.path.isdir(path): + file_list = os.listdir(path) + for file in file_list: + file_path = os.path.join(path, file) + if os.path.isfile(file_path): + os.remove(file_path) + else: + if str(file).startswith("场景"): + name = str(file).replace(".air", "") + del_file = os.path.join(file_path, name + ".py") + if os.path.exists(del_file): + os.remove(del_file) + shutil.rmtree(file_path) diff --git a/runner_web.py b/runner_web.py new file mode 100644 index 0000000000000000000000000000000000000000..383c8bff0a39ad84f76369a15c1114e2047de7d1 --- /dev/null +++ b/runner_web.py @@ -0,0 +1,99 @@ +# -*- encoding=utf8 -*- +import os +import sys +import platform +import shutil +import common.run_case_conditions as run +import common.case_tag_get as case_tag_get +curPath = os.path.abspath(os.path.dirname(__file__)) +rootPath = os.path.split(curPath)[0] +sys.path.append(rootPath) + + +if __name__ == '__main__': + # 第一个参数 case 执行类型，'all', 'sc', 'tag' + caseType = sys.argv[1] + # caseType="tag" + # 第2个参数要执行的caseName, 多个文件逗号分割 + caseName = sys.argv[2] + # caseName="登录主数据系统" + # 第3个参数，设置日志等级 + + log_level = sys.argv[3] + # log_level = "DEBUG" + log_level = log_level.lower() + #获取运行环境，写入环境变量 + env = sys.argv[4] + # env="sit" + os.environ['ENV'] = env.lower() + job_url = "" + #判断传入过来的参数数量是否>5个，如果>5，则传过来的第5个参数为job链接 + if len(sys.argv) > 5: + job_url = sys.argv[5] + + + #复制hosts文件 + if platform.system() == 'Windows': + cmd = "xcopy /s /y data\hosts C:\Windows\System32\drivers\etc\ " + else: + cmd = 'mv data/hosts /etc/' + os.system(cmd) + workspace = os.path.abspath(".") + case_path = os.path.join(workspace, 'air_case') + log_path = os.path.join(workspace, 'log') + runtime_log = os.path.join(log_path, 'runtime.txt') + if not os.path.exists(log_path): + os.makedirs('log') + if not os.path.exists(runtime_log): + os.system('type nul >log/run_time.txt') + + print("workspace: " + workspace) + print("air_case_path: " + case_path) + print("air_log_path: " + log_path) + print("caseType:" + caseType) + + test = run.CustomAirTestCase(workspace, case_path, log_path, runtime_log, log_level) + try: + if caseType == 'sc': + moduleName = sys.argv[2] + # moduleName = "spd3.0" + caseName = sys.argv[3] + # caseName = "登录主数据系统" + sceName = sys.argv[4] #场景名称 + # sceName = "" + log_level = sys.argv[5] + # log_level = "debug" + log_level = log_level.lower() + # 获取运行环境，写入环境变量 + env = sys.argv[6] + os.environ['ENV'] = env.lower() + test.run_by_scenario(moduleName, caseName, sceName) + else: + case_list = caseName.split(',') + if caseType == 'tag': + tag = sys.argv[2] + # tag ="登录主数据系统" + case_list = case_tag_get.get_case_tag_list(case_path, tag) + run_case, case_list, case_scenario_name = test.merge_new_file(case_list) + test.run_case(run_case, case_list, job_url, case_scenario_name) + except Exception as e: + print("Exception:", e) + finally: + """ + 检查air_case中是否有多余的.py文件和场景文件，有就删除 + """ + dir_list = os.listdir(case_path) + for cur_file in dir_list: + path = os.path.join(case_path, cur_file) + file_list = os.listdir(path) + for file in file_list: + file_path = os.path.join(path, file) + if os.path.isfile(file_path): + os.remove(file_path) + else: + if str(file).startswith("场景"): + name = str(file).replace(".air", "") + del_file = os.path.join(file_path, name + ".py") + if os.path.exists(del_file): + os.remove(del_file) + shutil.rmtree(file_path) diff --git a/templates/summary_template.html b/templates/summary_template.html index 188dad22199c062786e07accd9567ec023a6fc2d..ab8fb5092bd7e6348dff6eb2dfd824485749e34a 100644 --- a/templates/summary_template.html +++ b/templates/summary_template.html @@ -46,14 +46,14 @@ - - + + - + @@ -64,20 +64,18 @@
  • 测试概要
用例总数
用例总数 成功数 运行用时 成功率
{{summary_message.caseNum}} {{summary_message.passNum}} {{summary_message.time}}
- + - {% for r in case_results %} - + - {% endfor %}
  • 测试列表
用例名称 执行结果 执行时间(秒) 用例作者执行设备
{{r.name}} {{"成功" if r.result else "失败"}} {{r.time}} {{r.author}}{{r.device}}