From c8f9157b57a1b73280fe8a56e1f148c41ba35938 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Fri, 8 Sep 2017 08:01:26 +0800 Subject: [PATCH] Change the directory name Change the name of the directory to make it match with that defined in the CSIT job. Change-Id: I82f412de042232c4e1c53e68bca90c7a9ccbd0d3 Issue-ID: HOLMES-39 Signed-off-by: Guangrong Fu --- .../{holmes => holmes-rule-management}/sanity-check/setup.sh | 0 .../sanity-check/teardown.sh | 12 ++++++------ .../sanity-check/testplan.txt | 0 test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) rename test/csit/plans/{holmes => holmes-rule-management}/sanity-check/setup.sh (100%) rename test/csit/plans/{holmes => holmes-rule-management}/sanity-check/teardown.sh (76%) rename test/csit/plans/{holmes => holmes-rule-management}/sanity-check/testplan.txt (100%) diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh similarity index 100% rename from test/csit/plans/holmes/sanity-check/setup.sh rename to test/csit/plans/holmes-rule-management/sanity-check/setup.sh diff --git a/test/csit/plans/holmes/sanity-check/teardown.sh b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh similarity index 76% rename from test/csit/plans/holmes/sanity-check/teardown.sh rename to test/csit/plans/holmes-rule-management/sanity-check/teardown.sh index 4c457dc01..776522719 100644 --- a/test/csit/plans/holmes/sanity-check/teardown.sh +++ b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh @@ -15,11 +15,11 @@ # limitations under the License. # -kill-instance.sh i-rulemgt -kill-instance.sh i-engine-d -kill-instance.sh msb_internal_apigateway -kill-instance.sh msb_discovery -kill-instance.sh msb_consul -kill-instance.sh mysql-holmes +#kill-instance.sh i-rulemgt +#kill-instance.sh i-engine-d +#kill-instance.sh msb_internal_apigateway +#kill-instance.sh msb_discovery +#kill-instance.sh msb_consul +#kill-instance.sh mysql-holmes diff --git a/test/csit/plans/holmes/sanity-check/testplan.txt b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt similarity index 100% rename from test/csit/plans/holmes/sanity-check/testplan.txt rename to test/csit/plans/holmes-rule-management/sanity-check/testplan.txt diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot index b2039174d..03f840904 100644 --- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot +++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot @@ -23,9 +23,8 @@ queryConditionRule [Arguments] ${queryParam} ${codeFlag}=1 [Documentation] ${queryParam} : The data type is Json . create session microservices ${ruleMgtHost} - ${param} set variable queryrequest\=${queryParam} - ${headers} set variable - ${getResponse} get request microservices ${ruleMgtUrl} ${headers} ${param} + Comment ${param} set variable queryrequest\=${queryParam} + ${getResponse} get request microservices ${ruleMgtUrl}?queryrequest\=${queryParam} log ${getResponse.content} run keyword if ${codeFlag}==1 Should be equal as strings ${getResponse.status_code} 200 run keyword if ${codeFlag}!=1 Should be equal as strings ${getResponse.status_code} 499 -- 2.16.6