From f8b8352acaada6f679555de2cd9e1c0c75a24b76 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Sun, 1 Oct 2017 21:03:05 +0300 Subject: SDC test rename and timeouts increase Rename healthCheck test to sanity test Change-Id: Id24e18ef7b22592d7315de2ef992d59199bd2d6a Issue-Id: SDC-424 Signed-off-by: Yuli Shlosberg --- test/csit/plans/sdc/healthCheck/setup.sh | 37 -------------------------- test/csit/plans/sdc/healthCheck/teardown.sh | 22 --------------- test/csit/plans/sdc/healthCheck/testplan.txt | 3 --- test/csit/plans/sdc/sanity/setup.sh | 37 ++++++++++++++++++++++++++ test/csit/plans/sdc/sanity/teardown.sh | 22 +++++++++++++++ test/csit/plans/sdc/sanity/testplan.txt | 3 +++ test/csit/scripts/sdc/start_sdc_containers.sh | 4 +-- test/csit/scripts/sdc/start_sdc_sanity.sh | 2 +- test/csit/tests/sdc/healthCheck/__init__.robot | 2 -- test/csit/tests/sdc/healthCheck/test1.robot | 16 ----------- test/csit/tests/sdc/sanity/__init__.robot | 2 ++ test/csit/tests/sdc/sanity/test1.robot | 16 +++++++++++ 12 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 test/csit/plans/sdc/healthCheck/setup.sh delete mode 100644 test/csit/plans/sdc/healthCheck/teardown.sh delete mode 100644 test/csit/plans/sdc/healthCheck/testplan.txt create mode 100644 test/csit/plans/sdc/sanity/setup.sh create mode 100644 test/csit/plans/sdc/sanity/teardown.sh create mode 100644 test/csit/plans/sdc/sanity/testplan.txt delete mode 100644 test/csit/tests/sdc/healthCheck/__init__.robot delete mode 100644 test/csit/tests/sdc/healthCheck/test1.robot create mode 100644 test/csit/tests/sdc/sanity/__init__.robot create mode 100644 test/csit/tests/sdc/sanity/test1.robot diff --git a/test/csit/plans/sdc/healthCheck/setup.sh b/test/csit/plans/sdc/healthCheck/setup.sh deleted file mode 100644 index 3e4e66024..000000000 --- a/test/csit/plans/sdc/healthCheck/setup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# -# Place the scripts in run order: - - -source ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/docker_health.sh - -source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_sanity.sh - - -BE_IP=`get-instance-ip.sh sdc-BE` -echo BE_IP=${BE_IP} - - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v BE_IP:${BE_IP}" - diff --git a/test/csit/plans/sdc/healthCheck/teardown.sh b/test/csit/plans/sdc/healthCheck/teardown.sh deleted file mode 100644 index a5f69819e..000000000 --- a/test/csit/plans/sdc/healthCheck/teardown.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# - -source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh - -# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/test/csit/plans/sdc/healthCheck/testplan.txt b/test/csit/plans/sdc/healthCheck/testplan.txt deleted file mode 100644 index 2b2db1ede..000000000 --- a/test/csit/plans/sdc/healthCheck/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration.git]/test/csit/tests/. -# Place the suites in run order. -sdc/healthCheck diff --git a/test/csit/plans/sdc/sanity/setup.sh b/test/csit/plans/sdc/sanity/setup.sh new file mode 100644 index 000000000..3e4e66024 --- /dev/null +++ b/test/csit/plans/sdc/sanity/setup.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# +# Place the scripts in run order: + + +source ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/docker_health.sh + +source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_sanity.sh + + +BE_IP=`get-instance-ip.sh sdc-BE` +echo BE_IP=${BE_IP} + + +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v BE_IP:${BE_IP}" + diff --git a/test/csit/plans/sdc/sanity/teardown.sh b/test/csit/plans/sdc/sanity/teardown.sh new file mode 100644 index 000000000..a5f69819e --- /dev/null +++ b/test/csit/plans/sdc/sanity/teardown.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# + +source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh + +# $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/test/csit/plans/sdc/sanity/testplan.txt b/test/csit/plans/sdc/sanity/testplan.txt new file mode 100644 index 000000000..801f37d38 --- /dev/null +++ b/test/csit/plans/sdc/sanity/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +sdc/sanity diff --git a/test/csit/scripts/sdc/start_sdc_containers.sh b/test/csit/scripts/sdc/start_sdc_containers.sh index 7d61846f3..bccea70bb 100644 --- a/test/csit/scripts/sdc/start_sdc_containers.sh +++ b/test/csit/scripts/sdc/start_sdc_containers.sh @@ -61,7 +61,7 @@ docker run --detach --name sdc-BE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" echo "please wait while BE is starting..." echo "" -c=90 # seconds to wait +c=180 # seconds to wait REWRITE="\e[45D\e[1A\e[K" while [ $c -gt 0 ]; do c=$((c-1)) @@ -75,7 +75,7 @@ docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" echo "please wait while FE is starting..." echo "" -c=60 # seconds to wait +c=160 # seconds to wait REWRITE="\e[45D\e[1A\e[K" while [ $c -gt 0 ]; do c=$((c-1)) diff --git a/test/csit/scripts/sdc/start_sdc_sanity.sh b/test/csit/scripts/sdc/start_sdc_sanity.sh index 33dbf67aa..7f2de0ef9 100644 --- a/test/csit/scripts/sdc/start_sdc_sanity.sh +++ b/test/csit/scripts/sdc/start_sdc_sanity.sh @@ -47,7 +47,7 @@ INTERVAL=20 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do -PID=`docker exec -it sdc-sanity ps -ef | grep java | awk '{print $2}'` +PID=`docker exec -i sdc-sanity ps -ef | grep java | awk '{print $2}'` echo sanity PID is -- $PID if [ -z "$PID" ] diff --git a/test/csit/tests/sdc/healthCheck/__init__.robot b/test/csit/tests/sdc/healthCheck/__init__.robot deleted file mode 100644 index 8ee10d5f6..000000000 --- a/test/csit/tests/sdc/healthCheck/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation Sdc - HealthCheck diff --git a/test/csit/tests/sdc/healthCheck/test1.robot b/test/csit/tests/sdc/healthCheck/test1.robot deleted file mode 100644 index 6d4dc242d..000000000 --- a/test/csit/tests/sdc/healthCheck/test1.robot +++ /dev/null @@ -1,16 +0,0 @@ -*** Settings *** -Library Collections -Library OperatingSystem -Library RequestsLibrary -Library json - -*** Test Cases *** -Get Requests health check ok - [Tags] get - CreateSession sdc-be http://localhost:8080 - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} - Should Be Equal As Strings ${resp.status_code} 200 - @{ITEMS}= Copy List ${resp.json()['componentsInfo']} - : FOR ${ELEMENT} IN @{ITEMS} - \ Log ${ELEMENT['healthCheckComponent']} ${ELEMENT['healthCheckStatus']} diff --git a/test/csit/tests/sdc/sanity/__init__.robot b/test/csit/tests/sdc/sanity/__init__.robot new file mode 100644 index 000000000..8ee10d5f6 --- /dev/null +++ b/test/csit/tests/sdc/sanity/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation Sdc - HealthCheck diff --git a/test/csit/tests/sdc/sanity/test1.robot b/test/csit/tests/sdc/sanity/test1.robot new file mode 100644 index 000000000..6d4dc242d --- /dev/null +++ b/test/csit/tests/sdc/sanity/test1.robot @@ -0,0 +1,16 @@ +*** Settings *** +Library Collections +Library OperatingSystem +Library RequestsLibrary +Library json + +*** Test Cases *** +Get Requests health check ok + [Tags] get + CreateSession sdc-be http://localhost:8080 + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + Should Be Equal As Strings ${resp.status_code} 200 + @{ITEMS}= Copy List ${resp.json()['componentsInfo']} + : FOR ${ELEMENT} IN @{ITEMS} + \ Log ${ELEMENT['healthCheckComponent']} ${ELEMENT['healthCheckStatus']} -- cgit 1.2.3-korg