X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_unit_tests.sh;h=86096fabffa08007770945d6c2adca3c763592bf;hb=5442c9738c27d0c516040410f3f651fab4b7e70a;hp=71d21c9db502cb3a8e80034c060443e3eb89d432;hpb=1eaaf380669f26c8ad45d4b207a4d029b61268f6;p=functest.git

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 71d21c9db..86096fabf 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -2,32 +2,10 @@
 set -o errexit
 set -o pipefail
 
-# ******************************
-# 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
-if [ -d "/home/opnfv/functest/results" ]
-then
-    sudo rm -rf /home/opnfv/functest
-fi
-
-# 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
 
 
@@ -36,40 +14,36 @@ fi
 # ***************
 echo "Running unit tests..."
 
+sudo apt-get install -y build-essential python-dev python-pip
+sudo pip install virtualenv==15.1.0
+
 # start vitual env
 virtualenv $WORKSPACE/functest_venv
 source $WORKSPACE/functest_venv/bin/activate
 
 # install python packages
-sudo apt-get install -y build-essential python-dev python-pip
 pip install --upgrade pip
+pip install -r $WORKSPACE/requirements.txt
 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
-# To be deleted when all functest packages will be listed
 nosetests --with-xunit \
          --with-coverage \
-         --cover-erase \
          --cover-tests \
-         --cover-package=functest.core.testcase_base \
-         --cover-package=functest.opnfv_tests.sdn.odl.odl \
+         --cover-package=functest \
          --cover-xml \
          --cover-html \
+         --log-config=$(pwd)/functest/tests/unit/test_logging.ini \
          functest/tests/unit
 rc=$?
 
 deactivate
 
-# *******
-# clean
-# *******
-# Clean useless logs
-if [ -d "/home/opnfv/functest/results" ]
-then
-    sudo rm -rf /home/opnfv/functest/results
-fi
-
 exit $rc