diff --git a/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot b/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot index fa5394b..1aea7ef 100644 --- a/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/zResponsepagesCase.robot @@ -64,14 +64,13 @@ ReportInterfaceTest Reportest - log report + log Reportest开始 #${testdian} 传入测试点,测试点全覆盖 GroupBy 、DataBindings 、Filter 、Having ${testpoint} Set Variable Having - ${logtype} Set Variable security_event_log ${dataset_url} Set Variable http://${host}:${port}/${version}/report/dataset ${char_url} Set Variable http://${host}:${port}/${version}/report/chart ${report_url} Set Variable http://${host}:${port}/${version}/report/offlinejob - ${logtypelist} create list radius_record_log + ${logtypelist} create list security_event_log proxy_event_log connection_record_log radius_record_log voip_record_log ReportPositiveTest ${host} ${port} ${token} ${dataset_url} ${char_url} ${report_url} ${logtypelist} diff --git a/04-CustomLibrary/Custometest/ReportSchema.py b/04-CustomLibrary/Custometest/ReportSchema.py index aa06980..fb952e9 100644 --- a/04-CustomLibrary/Custometest/ReportSchema.py +++ b/04-CustomLibrary/Custometest/ReportSchema.py @@ -44,13 +44,13 @@ def groupby(schemajson,logtype,testpoint): dimensions=schemajson["data"]["doc"]["schema_query"]["dimensions"] dimensions.append("common_recv_time"); randomstr_1=[] + if logtype == "security_event_log" or logtype == "connection_record_log" or logtype == "voip_record_log": + dimensions.remove("common_start_time") + dimensions.remove("common_end_time") if testpoint == "DataBindings": randomstr_1.append("common_recv_time") else: randomstr_1=random.sample(dimensions, 4) - if logtype == "security_event_log" or logtype == "connection_record_log" or logtype == "voip_record_log" : - randomstr_1.remove("common_start_time") - randomstr_1.remove("common_end_time") #定义grp为返回值group的列表 grp=[] @@ -630,7 +630,7 @@ def ReportInterfaceTest(schemaurl,token,dataseturl,charurl,repporturl,datasetget datasetget=requests.get(url=datasetgeturl,headers=headers) dasetget=datasetget.json() datesetid=dasetget["data"]["list"][0]["id"] -# Deleteinterfaces(dataseturl,token,datesetid) + Deleteinterfaces(dataseturl,token,datesetid) # _datasetjson=json.loads(_datasetjson) # queryColumnList=_datasetjson["list"]["queryColumnList"] # groupColumnList=_datasetjson["list"]["groupColumnList"] @@ -670,8 +670,7 @@ def Deleteinterfaces(url,token,id): def ReportPositiveTest(host,port,token,dataseturl,charurl,repporturl,logtypelist): -# testpoint=["DataBindings","Filter","Having"] - testpoint=["DataBindings"] + testpoint=["DataBindings","Filter","Having"] for logtype in logtypelist: schemaurl="http://"+host+":"+port+"/v1/log/schema?logType="+logtype schema_new=schema(schemaurl,token,logtype)