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}