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

1、适应命令变化;cli命令返回没有换行符号，以提交bug，如果有修复再改回；

Browse Source 
2、删除tsg_show时间范围验证；
This commit is contained in:
dongxiaoyan
2020-04-28 19:51:12 +08:00
parent 1ace02da3c
commit bb427c16c6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
02-Keyword/tsg_cli/Interface.robot
View File

@@ -279,7 +279,7 @@ Tsg_Show_Interface
@{list} Run5 ${str} @{list} Run5 ${str}
${etime} Get Time ${etime} Get Time
FOR ${obj} IN @{list} FOR ${obj} IN @{list}
Time_Check ${obj}[time] ${stime} ${etime} #Time_Check ${obj}[time] ${stime} ${etime}
Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type] Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type]
Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled] Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled]
END END
@@ -294,7 +294,7 @@ Tsg_Show_APP
@{list} Run5 ${str} @{list} Run5 ${str}
${etime} Get Time ${etime} Get Time
FOR ${obj} IN @{list} FOR ${obj} IN @{list}
Time_Check ${obj}[time] ${stime} ${etime} #Time_Check ${obj}[time] ${stime} ${etime}
Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type] Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type]
Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled] Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled]
END END
@@ -309,7 +309,7 @@ Tsg_Show_Protocol
@{list} Run5 ${str} @{list} Run5 ${str}
${etime} Get Time ${etime} Get Time
FOR ${obj} IN @{list} FOR ${obj} IN @{list}
Time_Check ${obj}[time] ${stime} ${etime} #Time_Check ${obj}[time] ${stime} ${etime}
Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type] Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type]
Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled] Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled]
END END
@@ -324,7 +324,7 @@ Tsg_Show_Stream
@{list} Run5 ${str} @{list} Run5 ${str}
${etime} Get Time ${etime} Get Time
FOR ${obj} IN @{list} FOR ${obj} IN @{list}
Time_Check ${obj}[time] ${stime} ${etime} #Time_Check ${obj}[time] ${stime} ${etime}
Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type] Should Contain ${Tsg_Show_FlowType_Values} ${obj}[flow_type]
Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled] Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled]
END END
@@ -339,7 +339,7 @@ Tsg_Show_Intercept
@{list} Run5 ${str} @{list} Run5 ${str}
${etime} Get Time ${etime} Get Time
FOR ${obj} IN @{list} FOR ${obj} IN @{list}
Time_Check ${obj}[time] ${stime} ${etime} #Time_Check ${obj}[time] ${stime} ${etime}
Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled] Should Contain ${Tsg_Show_Sled_Values} ${obj}[sled]
END END
@@ -434,10 +434,10 @@ Run5
Write ${command} Write ${command}
${r} Read delay=10s ${r} Read delay=10s
Should Not Be Empty ${r} Should Not Be Empty ${r}
${str} Replace String ${r} ${\n} - #${str} Replace String ${r} ${\n} -
${index} Evaluate '${str}'.rindex('-') ${index} Evaluate '${r}'.rindex('tsgcli >')
${len} Convert To Integer ${index} ${len} Convert To Integer ${index}
${json} Evaluate '${str}'[0:${len}] ${json} Evaluate '${r}'[0:${len}]
${dict} json.Loads ${json} ${dict} json.Loads ${json}
${list} Convert To List ${dict} ${list} Convert To List ${dict}
[Return] ${list} [Return] ${list}