TSG-2827修改时间，通过效率，修改标签，用例描述更加准确

2020-08-10 19:07:01 +08:00
parent 17e4deab39
commit 7afa152d2a
85 changed files with 684 additions and 2319 deletions
--- a/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot
@@ -17,7 +17,6 @@ ${profiledId}     ${EMPTY}

 *** Test Cases ***
 Proxy-Policy-hijack-00001
-    [Tags]    fqdn
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId}
    #删除对象
@@ -28,10 +27,9 @@ Proxy-Policy-hijack-00001
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId}
-    GetLogList    proxy_event_log    ${hijack_starttime}    ${hijack_endtime}    ${testClentIP}    ${s}    http_host    vator.tv
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    vator.tv

 Proxy-Policy-hijack-00002
-    [Tags]    cat
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId1}
    #删除对象
@@ -42,10 +40,9 @@ Proxy-Policy-hijack-00002
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId1}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId1}
-    GetLogList    proxy_event_log    ${hijack_starttime1}    ${hijack_endtime1}    ${testClentIP}    ${s}    http_host    cruisecritic.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    cruisecritic.com

 Proxy-Policy-hijack-00003
-    [Tags]    url
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId2}
    #删除对象
@@ -56,13 +53,12 @@ Proxy-Policy-hijack-00003
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId2}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId2}
-    GetLogList    proxy_event_log    ${hijack_starttime2}    ${hijack_endtime2}    ${testClentIP}    ${s}    http_host    vegas.com
-    GetLogList    proxy_event_log    ${hijack_starttime3}    ${hijack_endtime3}    ${testClentIP}    ${s}    http_host    bytedance.com
-    GetLogList    proxy_event_log    ${hijack_starttime4}    ${hijack_endtime4}    ${testClentIP}    ${s}    http_host    toutiao.com
-    GetLogList    proxy_event_log    ${hijack_starttime5}    ${hijack_endtime5}    ${testClentIP}    ${s}    http_host    douyin.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    vegas.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    bytedance.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    toutiao.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    douyin.com

 Proxy-Policy-hijack-00004
-    [Tags]    请求头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId3}
    #删除对象
@@ -74,10 +70,9 @@ Proxy-Policy-hijack-00004
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId3}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId3}
-    GetLogList    proxy_event_log    ${hijack_starttime6}    ${hijack_endtime6}    ${testClentIP}    ${s}    http_host    huoshan.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    huoshan.com

 Proxy-Policy-hijack-00005
-    [Tags]    请求头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId4}
    #删除对象
@@ -89,10 +84,9 @@ Proxy-Policy-hijack-00005
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId4}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId4}
-    GetLogList    proxy_event_log    ${hijack_starttime7}    ${hijack_endtime7}    ${testClentIP}    ${s}    http_host    www.ixigua.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.ixigua.com

 Proxy-Policy-hijack-00006
-    [Tags]    请求头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId5}
    #删除对象
@@ -104,10 +98,9 @@ Proxy-Policy-hijack-00006
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId5}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId5}
-    GetLogList    proxy_event_log    ${hijack_starttime8}    ${hijack_endtime8}    ${testClentIP}    ${s}    http_host    www.dcdapp.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.dcdapp.com

 Proxy-Policy-hijack-00007
-    [Tags]    请求头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId6}
    #删除对象
@@ -119,10 +112,9 @@ Proxy-Policy-hijack-00007
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId6}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId6}
-    GetLogList    proxy_event_log    ${hijack_starttime9}    ${hijack_endtime9}    ${testClentIP}    ${s}    http_host    www.gogokid.com.cn
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.gogokid.com.cn

 Proxy-Policy-hijack-00008
-    [Tags]    应答头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId7}
    #删除对象
@@ -134,10 +126,9 @@ Proxy-Policy-hijack-00008
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId7}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId7}
-    GetLogList    proxy_event_log    ${hijack_starttime10}    ${hijack_endtime10}    ${testClentIP}    ${s}    http_host    mafengwo.cn
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    mafengwo.cn

 Proxy-Policy-hijack-00009
-    [Tags]    应答头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId8}
    #删除对象
@@ -149,10 +140,9 @@ Proxy-Policy-hijack-00009
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId8}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId8}
-    GetLogList    proxy_event_log    ${hijack_starttime11}    ${hijack_endtime11}    ${testClentIP}    ${s}    http_host    quote.hexun.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    quote.hexun.com

 Proxy-Policy-hijack-00010
-    [Tags]    应答头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId9}
    #删除对象
@@ -164,10 +154,9 @@ Proxy-Policy-hijack-00010
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId9}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId9}
-    GetLogList    proxy_event_log    ${hijack_starttime12}    ${hijack_endtime12}    ${testClentIP}    ${s}    http_host    tianya.cn
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    tianya.cn

 Proxy-Policy-hijack-00011
-    [Tags]    应答头
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId10}
    #删除对象
@@ -179,10 +168,9 @@ Proxy-Policy-hijack-00011
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId10}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId10}
-    GetLogList    proxy_event_log    ${hijack_starttime13}    ${hijack_endtime13}    ${testClentIP}    ${s}    http_host    mydrivers.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    mydrivers.com

 Proxy-Policy-hijack-00012
-    [Tags]    cookie
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId11}
    #删除对象
@@ -194,10 +182,9 @@ Proxy-Policy-hijack-00012
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId11}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId11}
-    GetLogList    proxy_event_log    ${hijack_starttime14}    ${hijack_endtime14}    ${testClentIP}    ${s}    http_host    www.reval.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.reval.com

 Proxy-Policy-hijack-00013
-    [Tags]    set-cookie
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId12}
    #删除对象
@@ -209,13 +196,12 @@ Proxy-Policy-hijack-00013
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId12}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId12}
-    GetLogList    proxy_event_log    ${hijack_starttime15}    ${hijack_endtime15}    ${testClentIP}    ${s}    http_host    nsscreencast.com
-    GetLogList    proxy_event_log    ${hijack_starttime16}    ${hijack_endtime16}    ${testClentIP}    ${s}    http_host    www.edreams.net
-    GetLogList    proxy_event_log    ${hijack_starttime17}    ${hijack_endtime17}    ${testClentIP}    ${s}    http_host    boutiquehotel.me
-    GetLogList    proxy_event_log    ${hijack_starttime18}    ${hijack_endtime18}    ${testClentIP}    ${s}    http_host    www.united.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    nsscreencast.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.edreams.net
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    boutiquehotel.me
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.united.com

 Proxy-Policy-hijack-00014
-    [Tags]    最大组合
    #删除文件
    ${profiledId}    set Variable    ${hijack_profileId13}
    #删除对象
@@ -230,4 +216,4 @@ Proxy-Policy-hijack-00014
    ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId13}]}
    ${policyIds}    Create List    ${policyId1}    ${policyId2}
    ${s}    Convert to String    ${hijack_policyId13}
-    GetLogList    proxy_event_log    ${hijack_starttime19}    ${hijack_endtime19}    ${testClentIP}    ${s}    http_host    www.travelzoo.com
+    GetLogList    proxy_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.travelzoo.com