Merge "Add nose and coverage requirements in unittest script"

diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml
index abb3481..78e80b3 100644 (file)
--- a/jjb/releng/testapi-automate.yml
+++ b/jjb/releng/testapi-automate.yml
@@ -55,8 +55,8 @@
         - cobertura:
             report-file: "coverage.xml"
             only-stable: "true"
-            health-auto-update: "true"
-            stability-auto-update: "true"
+            health-auto-update: "false"
+            stability-auto-update: "false"
             zoom-coverage-chart: "true"
             targets:
                 - files:

diff --git a/utils/test/testapi/run_test.sh b/utils/test/testapi/run_test.sh
index d1f05f2..51db09f 100755 (executable)
--- a/utils/test/testapi/run_test.sh
+++ b/utils/test/testapi/run_test.sh
@@ -5,20 +5,16 @@ set -o errexit
 # Get script directory
 SCRIPTDIR=`dirname $0`
 
-# Either Workspace is set (CI)
-if [ -z $WORKSPACE ]
-then
-    WORKSPACE="."
-fi
-
 echo "Running unit tests..."
 
 # Creating virtual environment
-virtualenv $WORKSPACE/testapi_venv
-source $WORKSPACE/testapi_venv/bin/activate
+virtualenv $SCRIPTDIR/testapi_venv
+source $SCRIPTDIR/testapi_venv/bin/activate
 
 # Install requirements
 pip install -r $SCRIPTDIR/requirements.txt
+pip install coverage
+pip install nose>=1.3.1
 
 find . -type f -name "*.pyc" -delete
 
@@ -26,7 +22,7 @@ nosetests --with-xunit \
     --with-coverage \
     --cover-erase \
     --cover-package=$SCRIPTDIR/opnfv_testapi/cmd \
-    --cover-package=$SCRIPTDIR/opnfv_testapi/commonn \
+    --cover-package=$SCRIPTDIR/opnfv_testapi/common \
     --cover-package=$SCRIPTDIR/opnfv_testapi/resources \
     --cover-package=$SCRIPTDIR/opnfv_testapi/router \
     --cover-xml \