diff --git a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot index 833ef68..f4df377 100644 --- a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot +++ b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot @@ -5,6 +5,9 @@ Resource ../../02-Keyword/tsg_cli/interface.robot *** Test Cases *** Security_Policy_Query_TestCase + # 查询默认拦截策略 + Tsg_Policy_Query tsg_security ${None} default intercept policy ${None} ${True} + # 取最多10条策略数据,分别做条件查询 ${list} Get_Policy_Object2 tsg_security FOR ${obj} IN @{list} diff --git a/01-TestCase/tsg_mib/MibTestCase.robot b/01-TestCase/tsg_mib/MibTestCase.robot index 4484896..2fa06c0 100644 --- a/01-TestCase/tsg_mib/MibTestCase.robot +++ b/01-TestCase/tsg_mib/MibTestCase.robot @@ -1,4 +1,5 @@ *** Settings *** +Force Tags tsg-mib query Test Setup OpenMibConnection Test Teardown CloseMibConnection Library json diff --git a/02-Keyword/tsg_cli/Interface.robot b/02-Keyword/tsg_cli/Interface.robot index 3cc501a..8ef0c6c 100644 --- a/02-Keyword/tsg_cli/Interface.robot +++ b/02-Keyword/tsg_cli/Interface.robot @@ -205,8 +205,9 @@ Tsg_Help_Keyword ... 参数:无 ... 返回:无 ${r} Run9 tsg_help - ${data} Evaluate open(r"${path}/${Tsg_Help_file_Path}",'rb').read() - Should Be Equal As Strings ${r} ${data} + ${data} Evaluate str(open(r"${path}/${Tsg_Help_file_Path}",'rb').read()) + ${data} Evaluate ${data.replace('\\n', '\\r\\n')} + Should Be Equal As Strings ${r} ${data} Tsg_Diagnose_Keyword [Documentation] @@ -224,8 +225,8 @@ Tsg_Command_Help [Arguments] ${cmd} ${str} Set Variable ${cmd} --help ${r} Run9 ${str} - ${data} Evaluate open(r"${path}/cli_files/${cmd}_help.txt",'rb').read() - Should Be Equal ${r} ${data} + ${data} Evaluate str(open(r"${path}/cli_files/${cmd}_help.txt",'rb').read(), 'utf-8') + Should Be Equal As Strings ${r} ${data} Tsg_Show_Chassis-ip [Documentation]