aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2017-09-08 08:01:26 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2017-09-08 13:36:46 +0800
commitc8f9157b57a1b73280fe8a56e1f148c41ba35938 (patch)
tree69e47007c0da5b6e590f62fa57e8f436afef848e
parentdbb53b6a12adb658c4b5535cd0126be44b9aeaa8 (diff)
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 <fu.guangrong@zte.com.cn>
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/setup.sh (renamed from test/csit/plans/holmes/sanity-check/setup.sh)0
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/teardown.sh (renamed from test/csit/plans/holmes/sanity-check/teardown.sh)12
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/testplan.txt (renamed from test/csit/plans/holmes/sanity-check/testplan.txt)0
-rw-r--r--test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot5
4 files changed, 8 insertions, 9 deletions
diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
index cbe107c16..cbe107c16 100644
--- a/test/csit/plans/holmes/sanity-check/setup.sh
+++ b/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
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
index e699512d7..e699512d7 100644
--- a/test/csit/plans/holmes/sanity-check/testplan.txt
+++ b/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