Revert "21.05版全流程case修改"

This reverts commit a7c9880278.
This commit is contained in:
hebingning
2021-05-17 09:50:56 +08:00
parent a7c9880278
commit c7edf5e738
96 changed files with 2193 additions and 3527 deletions

View File

@@ -1,5 +1,5 @@
*** Settings ***
Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds}
Test Teardown DeletePolicyAndObject ${policyIds} ${objectids}
Force Tags tsg_adc_wp adc_log proxy_policy
Library OperatingSystem
Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot
@@ -12,7 +12,6 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt
*** Variables ***
${policyIds} ${EMPTY}
${objectids} ${EMPTY}
${categoryIds} ${EMPTY}
*** Test Cases ***
Proxy-Policy-replace-00001
@@ -33,8 +32,6 @@ Proxy-Policy-replace-00002
${objectids} set Variable ${replace_objectId1}
${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId40}
${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId44}
#删除category
${categoryIds} set Variable ${replace_categoryId}
#删除策略
${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId1}]}
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId1}]}
@@ -44,13 +41,14 @@ Proxy-Policy-replace-00002
Proxy-Policy-replace-00003
#删除对象
${objectids} set Variable ${replace_objectId2}
#${objectids} set Variable ${replace_objectId2}
${objectids} set Variable ${replace_objectId3}
#删除策略
${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId2}]}
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId2}]}
${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${replace_policyId2}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host umcfa.webs.com
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.pjpugliese.com
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host carblog.co.za
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host ornithomedia