From a3f9d64293dc8a8ccc54d0b0cc3f7a6e61558a6b Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Thu, 18 Jun 2020 12:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=82=E5=BA=94Linux?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E6=95=B4=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/02-Keyword/tsg_cli/Interface.robot b/02-Keyword/tsg_cli/Interface.robot
index 46a68eb..1e724cb 100644
--- a/02-Keyword/tsg_cli/Interface.robot
+++ b/02-Keyword/tsg_cli/Interface.robot
@@ -388,17 +388,13 @@ Run1_B
     #${len}    Convert To Integer    ${index}    
     #${json}    Evaluate    '${str}'[0:${len}]
     
-    #${testStr}      Catenate    '''    ${str}       '''
-    #${testIndex3}    Evaluate    ${testStr}.rindex('}')
-    #Log    ${testIndex3}
-    #${len}    Convert To Integer    ${testIndex3}
-    #${json}    Get Substring    ${str}    0    ${len}
-    
-    ${testStr1}      Catenate    '''    ${str}       '''
-    ${testIndex3}    Evaluate    ${testStr1}.rindex('-') - 1
+    #为适应linux下执行调整
+    ${testStr}      Catenate    '''    ${str}       '''
+    ${testIndex3}    Evaluate    ${testStr}.rindex('}')
     Log    ${testIndex3}
     ${len}    Convert To Integer    ${testIndex3}
     ${json}    Get Substring    ${str}    0    ${len}
+    
     Log    ${json}
     ${dict}    json.Loads    ${json}
     Should Be True    ${dict}[data][total] > 0
@@ -450,9 +446,18 @@ Run5
     #用换行符作为命令结束
     ${str}    Replace String    ${r}    ${\n}    - 
     
-    ${index}    Evaluate    '${str}'.rindex('-')
-    ${len}    Convert To Integer    ${index}    
-    ${json}    Evaluate    '${str}'[0:${len}]
+    #${index}    Evaluate    '${str}'.rindex('-')
+    #${len}    Convert To Integer    ${index}    
+    #${json}    Evaluate    '${str}'[0:${len}]
+
+    #为适应linux下执行调整
+    ${testStr1}      Catenate    '''    ${str}       '''
+    ${testIndex3}    Evaluate    ${testStr1}.rindex('-') - 1
+    Log    ${testIndex3}
+    ${len}    Convert To Integer    ${testIndex3}
+    ${json}    Get Substring    ${str}    0    ${len}
+    Log    ${json}    
+
     #cli命令结果返回结束为换行使用下面截取
     #${index}    Evaluate    '${r}'.rindex('tsgcli >')
     #${len}    Convert To Integer    ${index}