diff --git a/01-TestCase/tsg_adc/api_proxy/AllowHttpTests.robot b/01-TestCase/tsg_adc/api_proxy/AllowHttpTests.robot index 2c9440a..3a10859 100644 --- a/01-TestCase/tsg_adc/api_proxy/AllowHttpTests.robot +++ b/01-TestCase/tsg_adc/api_proxy/AllowHttpTests.robot @@ -264,7 +264,7 @@ roxyPolicy-allow-http-00008 #删除所有策略 ${policyIds} Create List ${policyId1} ${policyId5} #功能端验证 - ${commandstr} set variable ${curlbatpath}/ProxyPolicy_allow_ssl00008 + ${commandstr} set variable ${curlbatpath}/ProxyPolicy_allow_ssl00008.bat ${stringlist} Create List 美国中文网 ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s diff --git a/01-TestCase/tsg_adc/api_proxy/InsertHttpTests.robot b/01-TestCase/tsg_adc/api_proxy/InsertHttpTests.robot index 6b183a2..b931c44 100644 --- a/01-TestCase/tsg_adc/api_proxy/InsertHttpTests.robot +++ b/01-TestCase/tsg_adc/api_proxy/InsertHttpTests.robot @@ -7,8 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../03-Variable/AllFlowCaseVariable.txt -Library custometest -Resource ../../02-Keyword/tsg-ui/StmpHandle2.robot +Library Custometest *** Test Cases *** ProxyPolicy-insert-Http-js-00001 diff --git a/01-TestCase/tsg_adc/api_proxy/InsertSSLTest.robot b/01-TestCase/tsg_adc/api_proxy/InsertSSLTest.robot index 6700fdc..00fb6db 100644 --- a/01-TestCase/tsg_adc/api_proxy/InsertSSLTest.robot +++ b/01-TestCase/tsg_adc/api_proxy/InsertSSLTest.robot @@ -7,8 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../03-Variable/AllFlowCaseVariable.txt -Library custometest -Resource ../../02-Keyword/tsg-ui/StmpHandle2.robot +Library Custometest *** Test Cases *** ProxyPolicy-insert-SSL-js-00001 diff --git a/01-TestCase/tsg_adc/api_security/DenyMailTests.robot b/01-TestCase/tsg_adc/api_security/DenyMailTests.robot index 16a344f..0f9a3c0 100644 --- a/01-TestCase/tsg_adc/api_security/DenyMailTests.robot +++ b/01-TestCase/tsg_adc/api_security/DenyMailTests.robot @@ -4,6 +4,7 @@ Force Tags tsg_adc tsg_security Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot +Resource ../../../02-Keyword/tsg_common/StmpHandle.robot Library Custometest *** Test Cases *** diff --git a/02-Keyword/tsg_common/ManageObjectBody.robot b/02-Keyword/tsg_common/ManageObjectBody.robot index d08f5c0..0c4216c 100644 --- a/02-Keyword/tsg_common/ManageObjectBody.robot +++ b/02-Keyword/tsg_common/ManageObjectBody.robot @@ -2,7 +2,7 @@ Library json Library Collections Resource ../../03-Variable/BifangApiVariable.txt -Resource ../../02-Keyword/tsg_bfapi/policyobject.robot +Resource ../../02-Keyword/tsg_bfapi/PolicyObject.robot *** Keywords *** ObjectParamsOpertion diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot index feaedb8..0c3bce4 100644 --- a/02-Keyword/tsg_common/ManagePolicyBody.robot +++ b/02-Keyword/tsg_common/ManagePolicyBody.robot @@ -2,7 +2,7 @@ Library json Library Collections Resource ../../03-Variable/BifangApiVariable.txt -Resource ../../02-Keyword/tsg_bfapi/policyobject.robot +Resource ../../02-Keyword/tsg_bfapi/PolicyObject.robot *** Keywords *** # ... 特殊参数说明: diff --git a/04-CustomLibrary/Custometest/__init__.py b/04-CustomLibrary/Custometest/__init__.py index a4b4d83..4081636 100644 --- a/04-CustomLibrary/Custometest/__init__.py +++ b/04-CustomLibrary/Custometest/__init__.py @@ -4,13 +4,13 @@ created by hch 2019-06-26 ''' -from custometest.printlog import printlog -from custometest.MD5 import MD5 -from custometest.cmd_cer import Order +from Custometest.printlog import printlog +from Custometest.MD5 import MD5 +from Custometest.cmd_cer import Order # from custometest.printlog import printlog __version__ = '1.0' -class custometest(printlog,Order,MD5): +class Custometest(printlog,Order,MD5): ROBOT_LIBRARY_SCOPE = 'GLOBAL'