From bb427c16c6a602f64adfaf2b34b781fd66a4b757 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Tue, 28 Apr 2020 19:51:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=80=82=E5=BA=94=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96;cli=E5=91=BD=E4=BB=A4=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8D=A2=E8=A1=8C=E7=AC=A6=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E4=BA=A4bug=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=9C=89=E4=BF=AE=E5=A4=8D=E5=86=8D=E6=94=B9=E5=9B=9E=EF=BC=9B?=
 =?UTF-8?q?=202=E3=80=81=E5=88=A0=E9=99=A4tsg=5Fshow=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=AA=8C=E8=AF=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_cli/Interface.robot | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/02-Keyword/tsg_cli/Interface.robot b/02-Keyword/tsg_cli/Interface.robot
index 656776d..cb07bac 100644
--- a/02-Keyword/tsg_cli/Interface.robot
+++ b/02-Keyword/tsg_cli/Interface.robot
@@ -279,7 +279,7 @@ Tsg_Show_Interface
     @{list}    Run5    ${str}
     ${etime}    Get Time
     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_Sled_Values}    ${obj}[sled]    
     END
@@ -294,7 +294,7 @@ Tsg_Show_APP
     @{list}    Run5    ${str}
     ${etime}    Get Time
     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_Sled_Values}    ${obj}[sled]    
     END
@@ -309,7 +309,7 @@ Tsg_Show_Protocol
     @{list}    Run5    ${str}
     ${etime}    Get Time
     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_Sled_Values}    ${obj}[sled]   
     END
@@ -324,7 +324,7 @@ Tsg_Show_Stream
     @{list}    Run5    ${str}
     ${etime}    Get Time
     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_Sled_Values}    ${obj}[sled]    
     END
@@ -339,7 +339,7 @@ Tsg_Show_Intercept
     @{list}    Run5    ${str}
     ${etime}    Get Time
     FOR    ${obj}    IN    @{list}
-        Time_Check    ${obj}[time]    ${stime}    ${etime}
+        #Time_Check    ${obj}[time]    ${stime}    ${etime}
     	Should Contain    ${Tsg_Show_Sled_Values}    ${obj}[sled]    
     END
 
@@ -434,10 +434,10 @@ Run5
     Write    ${command}
     ${r}    Read    delay=10s   
     Should Not Be Empty    ${r}
-    ${str}    Replace String    ${r}    ${\n}    -
-    ${index}    Evaluate    '${str}'.rindex('-')
+    #${str}    Replace String    ${r}    ${\n}    -
+    ${index}    Evaluate    '${r}'.rindex('tsgcli >')
     ${len}    Convert To Integer    ${index}    
-    ${json}    Evaluate    '${str}'[0:${len}] 
+    ${json}    Evaluate    '${r}'[0:${len}] 
     ${dict}    json.Loads    ${json}
     ${list}    Convert To List    ${dict}
     [Return]    ${list}