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

Merge branch 'develop' of https://git.mesalab.cn/dongxiaoyan/tsg_autotest.git into develop

Browse Source
This commit is contained in:
dongxiaoyan
2020-04-07 17:13:53 +08:00
parent bdae6f5ab9 2b22a250f8
commit ff6b8e2650
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,8 @@ Tsg_Policy_EnDisable
${r} Tsg_Policy_Query ${type} ${id} ${None} ${None} ${True}
${value} Run Keyword If '${commandType}'=='disable' Convert To Integer 0
... ELSE Convert To Integer 1
Should Be Equal ${r}[data][list][0][isValid] ${value}
#Should Be Equal ${r}[data][list][0][isValid] ${value}
Run Keyword If '${cliUsername}'=='tsgadmin' Should Be Equal ${r}[data][list][0][isValid] ${value}
Tsg_Policy_Object_Query
[Documentation]
@@ -354,7 +355,7 @@ Run1
Run1_A
[Arguments] ${r}
Should Contain ${r} Permission denied
Should Contain ${r} command not found
${dict} To Json {"data":{"list":[{"policyDesc":"","policyId":0,"policyName":"","policyType":"","objectType":"","objectName":"","isValid":0},{"policyDesc":"","policyId":0,"policyName":"","policyType":"","isValid":0}],"total":2},"msg":"Success"}
[Return] ${dict}
@@ -378,7 +379,7 @@ Run2
[Arguments] ${command}
Write ${command}
${r} Read delay=10s
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain ${r} Permission denied
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain ${r} command not found
... ELSE Should Contain ${r} Success
Run3
@@ -387,7 +388,7 @@ Run3
... 参数：command(具体指令内容)
... 返回：无
[Arguments] ${command}
${flag} Run Keyword If '${cliUsername}'!='tsgadmin' Set Variable Permission denied
${flag} Run Keyword If '${cliUsername}'!='tsgadmin' Set Variable command not found
... ELSE Set Variable Success
# 执行'text'指令，在'timeout'时间内每隔'retry_interval'时间重试，直至返回值出现'expected'时或超时结束
Write Until Expected Output ${command}\n ${flag} ${timeout} ${retryInterval}
@@ -401,7 +402,7 @@ Run4
[Arguments] ${command}
Write ${command}
${r} Read delay=10s
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain Any ${r} Permission denied -bash:
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain Any ${r} command not found -bash:
... ELSE Should Not Contain ${r} head:
Run5
@@ -430,7 +431,7 @@ Run6
Write ${command}
${r} Read delay=10s
Should Not Be Empty ${r}
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain ${r} Permission denied
Run Keyword If '${cliUsername}'!='tsgadmin' Should Contain ${r} command not found
... ELSE Should Contain ${r} ${param}
Run7