From: Yuli Shlosberg <ys9693@att.com>
Date: Sun, 1 Oct 2017 18:03:05 +0000 (+0300)
Subject: SDC test rename and timeouts increase
X-Git-Tag: 1.0.0-Amsterdam~201^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f8b8352acaada6f679555de2cd9e1c0c75a24b76;p=integration.git

SDC test rename and timeouts increase

Rename healthCheck test to sanity test

Change-Id: Id24e18ef7b22592d7315de2ef992d59199bd2d6a
Issue-Id:  SDC-424
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---

diff --git a/test/csit/plans/sdc/healthCheck/setup.sh b/test/csit/plans/sdc/sanity/setup.sh
similarity index 100%
rename from test/csit/plans/sdc/healthCheck/setup.sh
rename to 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
similarity index 100%
rename from test/csit/plans/sdc/healthCheck/teardown.sh
rename to 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
similarity index 87%
rename from test/csit/plans/sdc/healthCheck/testplan.txt
rename to 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
similarity index 100%
rename from test/csit/tests/sdc/healthCheck/__init__.robot
rename to 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
similarity index 100%
rename from test/csit/tests/sdc/healthCheck/test1.robot
rename to test/csit/tests/sdc/sanity/test1.robot