gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改，将导入错误接口校验返回行数与传入文件错误行数之间关系由子集关系改为完全相同关系

Browse Source
This commit is contained in:
hebingning
2020-12-30 11:48:46 +08:00
parent ff055c8320
commit b131d98ef8
1 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
01-TestCase/tsg_bfapi/policy_object/ExportAndImport.robot
View File

@@ -702,7 +702,7 @@ Object-Import-v1-ip_error
${objectIds} Set Variable ${EMPTY} ${objectIds} Set Variable ${EMPTY}
log ${objectIds} log ${objectIds}
${rescode} ${objectType} ${importRes} ImportObject uploadFiles ip_error.txt ip ${EMPTY} ${EMPTY} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles ip_error.txt ip ${EMPTY} ${EMPTY}
${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']}
${invaidData} Set Variable ${importRes['data']['invalidData']} ${invaidData} Set Variable ${importRes['data']['invalidData']}
${len} get Length ${invaidData} ${len} get Length ${invaidData}
@{invaidDataLine} create list ${EMPTY} @{invaidDataLine} create list ${EMPTY}
@@ -711,13 +711,16 @@ Object-Import-v1-ip_error
Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']}
END END
Remove From List ${invaidDataLine} 0 Remove From List ${invaidDataLine} 0
Insert Into List ${invaidDataLine} 0 ${duplicateLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
log ${invaidDataLine} log ${invaidDataLine}
${errorline} Create List 7 12 17 5 ${errorline} Create List 7 12 17 5 12
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
#Should Be Equal ${invaidDataLine} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline}
${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) Sort List ${resErrorLines}
${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine})
${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
sleep 5 sleep 5
@@ -743,8 +746,10 @@ Object-Import-v1-fqdn_error_andReachlimit
log ${resErrorLines} log ${resErrorLines}
${errorline} Create List 99989 99988 99990 99991 99992 99993 99977 99984 99985 99986 ${errorline} Create List 99989 99988 99990 99991 99992 99993 99977 99984 99985 99986
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
#Should Be Equal ${invaidDataLine} ${errorline} Sort List ${resErrorLines}
${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines})
${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} ${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
@@ -769,10 +774,12 @@ Object-Import-v1-subid_error_andReachlimit
${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
#Insert Into List ${invaidDataLine} 0 ${duplicateLine} #Insert Into List ${invaidDataLine} 0 ${duplicateLine}
log ${resErrorLines} log ${resErrorLines}
${errorline} Create List 8165 8167 22037 22044 ${errorline} Create List 8165 8167 22037 22044 22037
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
#Should Be Equal ${invaidDataLine} ${errorline} Sort List ${resErrorLines}
${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines})
${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} ${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
@@ -785,7 +792,7 @@ Object-Import-v1-HTTP Signatures_error_andReachlimit
${objectIds} Set Variable ${EMPTY} ${objectIds} Set Variable ${EMPTY}
log ${objectIds} log ${objectIds}
${rescode} ${objectType} ${importRes} ImportObject uploadFiles httpsig10w.txt http_signature ${EMPTY} ${EMPTY} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles httpsig10w.txt http_signature ${EMPTY} ${EMPTY}
${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']}
${invaidData} Set Variable ${importRes['data']['invalidData']} ${invaidData} Set Variable ${importRes['data']['invalidData']}
${len} get Length ${invaidData} ${len} get Length ${invaidData}
@{invaidDataLine} create list ${EMPTY} @{invaidDataLine} create list ${EMPTY}
@@ -794,12 +801,15 @@ Object-Import-v1-HTTP Signatures_error_andReachlimit
Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']}
END END
Remove From List ${invaidDataLine} 0 Remove From List ${invaidDataLine} 0
Insert Into List ${invaidDataLine} 0 ${duplicateLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
log ${invaidDataLine} log ${invaidDataLine}
${errorline} Create List 16 99993 76520 76507 76508 ${errorline} Create List 16 99996 76522 76507
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
Sort List ${resErrorLines}
Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#Should Be Equal ${invaidDataLine} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline}
${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine})
${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
@@ -812,7 +822,7 @@ Object-Import-v1-Keywords_error_andReachlimit
${objectIds} Set Variable ${EMPTY} ${objectIds} Set Variable ${EMPTY}
log ${objectIds} log ${objectIds}
${rescode} ${objectType} ${importRes} ImportObject uploadFiles keyword_10w.txt keywords ${EMPTY} ${EMPTY} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles keyword_10w.txt keywords ${EMPTY} ${EMPTY}
${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']}
${invaidData} Set Variable ${importRes['data']['invalidData']} ${invaidData} Set Variable ${importRes['data']['invalidData']}
${len} get Length ${invaidData} ${len} get Length ${invaidData}
@{invaidDataLine} create list ${EMPTY} @{invaidDataLine} create list ${EMPTY}
@@ -821,13 +831,16 @@ Object-Import-v1-Keywords_error_andReachlimit
Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']}
END END
Remove From List ${invaidDataLine} 0 Remove From List ${invaidDataLine} 0
Insert Into List ${invaidDataLine} 0 ${duplicateLine} #Insert Into List ${invaidDataLine} 0 ${duplicateLine}
log ${invaidDataLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
log ${resErrorLines}
${errorline} Create List 34 41 70 72454 ${errorline} Create List 34 41 70 72454
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
#Should Be Equal ${invaidDataLine} ${errorline} Sort List ${resErrorLines}
${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) Sort List ${errorline}
${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} Should Be Equal ${resErrorLines} ${errorline}
#${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine})
${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
sleep 5 sleep 5
@@ -839,7 +852,7 @@ Object-Import-v1-URLs_error_andReachlimit
${objectIds} Set Variable ${EMPTY} ${objectIds} Set Variable ${EMPTY}
log ${objectIds} log ${objectIds}
${rescode} ${objectType} ${importRes} ImportObject uploadFiles url_1000000.txt url ${EMPTY} ${EMPTY} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles url_1000000.txt url ${EMPTY} ${EMPTY}
${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']}
${invaidData} Set Variable ${importRes['data']['invalidData']} ${invaidData} Set Variable ${importRes['data']['invalidData']}
${len} get Length ${invaidData} ${len} get Length ${invaidData}
@{invaidDataLine} create list ${EMPTY} @{invaidDataLine} create list ${EMPTY}
@@ -848,13 +861,18 @@ Object-Import-v1-URLs_error_andReachlimit
Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']}
END END
Remove From List ${invaidDataLine} 0 Remove From List ${invaidDataLine} 0
Insert Into List ${invaidDataLine} 0 ${duplicateLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
log ${resErrorLines}
#Insert Into List ${invaidDataLine} 0 ${duplicateLine}
log ${invaidDataLine} log ${invaidDataLine}
${errorline} Create List 8 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9423 ${errorline} Create List 8 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9423
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
Sort List ${resErrorLines}
Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#Should Be Equal ${invaidDataLine} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline}
${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine})
${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
sleep 5 sleep 5
@@ -866,7 +884,7 @@ Object-Import-v1-Accounts_error_andReachlimit
${objectIds} Set Variable ${EMPTY} ${objectIds} Set Variable ${EMPTY}
log ${objectIds} log ${objectIds}
${rescode} ${objectType} ${importRes} ImportObject uploadFiles account10w.txt account ${EMPTY} ${EMPTY} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles account10w.txt account ${EMPTY} ${EMPTY}
${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']}
${invaidData} Set Variable ${importRes['data']['invalidData']} ${invaidData} Set Variable ${importRes['data']['invalidData']}
${len} get Length ${invaidData} ${len} get Length ${invaidData}
@{invaidDataLine} create list ${EMPTY} @{invaidDataLine} create list ${EMPTY}
@@ -875,13 +893,16 @@ Object-Import-v1-Accounts_error_andReachlimit
Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']}
END END
Remove From List ${invaidDataLine} 0 Remove From List ${invaidDataLine} 0
Insert Into List ${invaidDataLine} 0 ${duplicateLine} ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine}
log ${invaidDataLine} log ${invaidDataLine}
${errorline} Create List 13 14 15 20 ${errorline} Create List 13 14 15 20
${errorline} Evaluate list(map(int,${errorline})) ${errorline} Evaluate list(map(int,${errorline}))
Sort List ${resErrorLines}
Sort List ${errorline}
Should Be Equal ${resErrorLines} ${errorline}
#Should Be Equal ${invaidDataLine} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline}
${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine})
${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType}
log pssssssssssssssssssssssssssssssssssssssssssssssssssss log pssssssssssssssssssssssssssssssssssssssssssssssssssss
${objectIds} Create List ${response['data']['list'][0]['objectId']} ${objectIds} Create List ${response['data']['list'][0]['objectId']}
sleep 5 sleep 5