From 2b22a250f8561455a889c83b0a240345703cf399 Mon Sep 17 00:00:00 2001
From: zhangwenqing <m17600606391_1@163.com>
Date: Tue, 7 Apr 2020 16:57:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(Cli)=EF=BC=9A=E4=BF=AE=E6=AD=A3=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=88=B7=E6=89=A7=E8=A1=8C=E7=89=B9=E6=9D=83?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=97=B6=E7=9A=84=E6=96=AD=E8=A8=80=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_cli/Interface.robot | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/02-Keyword/tsg_cli/Interface.robot b/02-Keyword/tsg_cli/Interface.robot
index d21799b..1aa2b18 100644
--- a/02-Keyword/tsg_cli/Interface.robot
+++ b/02-Keyword/tsg_cli/Interface.robot
@@ -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