X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_unit_tests.sh;h=3de9b36f9112ec93653df6b1531fb1c761f70206;hb=e59055e29b5cc6a027d3a24803cc05fd709cca90;hp=e0e6195cb58257ef204ae003b8f7e1d7434e14ed;hpb=563c3e610f184d311f8a4f45cbee51f532f73e49;p=functest.git

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index e0e6195cb..3de9b36f9 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -2,36 +2,10 @@
 set -o errexit
 set -o pipefail
 
-function clean_results_dir {
-    if [ -d "/home/opnfv/functest/results" ]
-    then
-        sudo rm -rf /home/opnfv/functest/results
-    fi
-}
-
-# ******************************
-# prepare the env for the tests
-# ******************************
-# clean useless results dir
-# should be done at the end
-# but in case of crash during unit test
-# clean it anyway
-clean_results_dir
-
-# TODO clean that...
-# Create log dir if needed
-# log shall be disabled during unit tests
-# fix to be done in Logger
-echo "Create dummy log file...."
-sudo mkdir -p /home/opnfv/functest/results/odl
-sudo touch /home/opnfv/functest/results/functest.log
-sudo touch /home/opnfv/functest/results/odl/stdout.txt
-sudo chmod -Rf a+rw /home/opnfv
-
 # Either Workspace is set (CI)
 if [ -z $WORKSPACE ]
 then
-    WORKSPACE="."
+    WORKSPACE=`pwd`
 fi
 
 
@@ -50,6 +24,12 @@ pip install --upgrade pip
 pip install -r $WORKSPACE/test-requirements.txt
 pip install $WORKSPACE
 
+#install releng
+rm -rf releng-unittests
+git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng releng-unittests
+pip install releng-unittests/modules/
+rm -fr releng-unittests
+
 export CONFIG_FUNCTEST_YAML=$(pwd)/functest/ci/config_functest.yaml
 # unit tests
 # TODO: remove cover-erase
@@ -58,21 +38,19 @@ nosetests --with-xunit \
          --with-coverage \
          --cover-erase \
          --cover-tests \
+         --cover-package=functest.ci \
          --cover-package=functest.cli \
-         --cover-package=functest.core.testcase_base \
+         --cover-package=functest.core.testcase \
          --cover-package=functest.opnfv_tests.sdn.odl.odl \
+         --cover-package=functest.opnfv_tests.vnf.ims \
          --cover-package=functest.utils \
+         --cover-package=functest.opnfv_tests.openstack \
          --cover-xml \
          --cover-html \
+         --log-config=$(pwd)/functest/tests/unit/test_logging.ini \
          functest/tests/unit
 rc=$?
 
 deactivate
 
-# *******
-# clean
-# *******
-# Clean useless logs
-clean_results_dir
-
 exit $rc