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

修改适应Linux部分调整更正

Browse Source
This commit is contained in:
dongxiaoyan
2020-06-18 12:07:05 +08:00
parent b439b79e90
commit a3f9d64293
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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