aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-03 14:24:00 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-03 14:24:00 +0000
commit60032a5529c26de6d9c24b3b1f4806f1188c51ce (patch)
treeee4f43ed2f7e76350773b23742fb0bc119ea8c4a
parent56bdb25c0ffdef131ec4bc160e2b686e9aad73ea (diff)
parentf8b8352acaada6f679555de2cd9e1c0c75a24b76 (diff)
Merge "SDC test rename and timeouts increase"
-rw-r--r--test/csit/plans/sdc/sanity/setup.sh (renamed from test/csit/plans/sdc/healthCheck/setup.sh)0
-rw-r--r--test/csit/plans/sdc/sanity/teardown.sh (renamed from test/csit/plans/sdc/healthCheck/teardown.sh)0
-rw-r--r--test/csit/plans/sdc/sanity/testplan.txt (renamed from test/csit/plans/sdc/healthCheck/testplan.txt)2
-rw-r--r--test/csit/scripts/sdc/start_sdc_containers.sh4
-rw-r--r--test/csit/scripts/sdc/start_sdc_sanity.sh2
-rw-r--r--test/csit/tests/sdc/sanity/__init__.robot (renamed from test/csit/tests/sdc/healthCheck/__init__.robot)0
-rw-r--r--test/csit/tests/sdc/sanity/test1.robot (renamed from test/csit/tests/sdc/healthCheck/test1.robot)0
7 files changed, 4 insertions, 4 deletions
diff --git a/test/csit/plans/sdc/healthCheck/setup.sh b/test/csit/plans/sdc/sanity/setup.sh
index 3e4e66024..3e4e66024 100644
--- a/test/csit/plans/sdc/healthCheck/setup.sh
+++ b/test/csit/plans/sdc/sanity/setup.sh
diff --git a/test/csit/plans/sdc/healthCheck/teardown.sh b/test/csit/plans/sdc/sanity/teardown.sh
index a5f69819e..a5f69819e 100644
--- a/test/csit/plans/sdc/healthCheck/teardown.sh
+++ b/test/csit/plans/sdc/sanity/teardown.sh
diff --git a/test/csit/plans/sdc/healthCheck/testplan.txt b/test/csit/plans/sdc/sanity/testplan.txt
index 2b2db1ede..801f37d38 100644
--- a/test/csit/plans/sdc/healthCheck/testplan.txt
+++ b/test/csit/plans/sdc/sanity/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration.git]/test/csit/tests/.
# Place the suites in run order.
-sdc/healthCheck
+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/sanity/__init__.robot
index 8ee10d5f6..8ee10d5f6 100644
--- a/test/csit/tests/sdc/healthCheck/__init__.robot
+++ b/test/csit/tests/sdc/sanity/__init__.robot
diff --git a/test/csit/tests/sdc/healthCheck/test1.robot b/test/csit/tests/sdc/sanity/test1.robot
index 6d4dc242d..6d4dc242d 100644
--- a/test/csit/tests/sdc/healthCheck/test1.robot
+++ b/test/csit/tests/sdc/sanity/test1.robot