X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_unit_tests.sh;h=9780de7acf72e176ed0c775b502b050469c67554;hb=ee26a1ca85fc5fac6df6c39f362fad83de73c0cc;hp=05b3c4ee2ce8bb282d0361ad9ee8e5032ca60a33;hpb=04150507cb6ebc7085d40e2f09c5006e685eedce;p=functest.git

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 05b3c4ee2..9780de7ac 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
 
 
@@ -41,38 +19,28 @@ virtualenv $WORKSPACE/functest_venv
 source $WORKSPACE/functest_venv/bin/activate
 
 # install python packages
-easy_install -U setuptools
-easy_install -U pip
+sudo apt-get install -y build-essential python-dev python-pip
+pip install --upgrade pip
 pip install -r $WORKSPACE/test-requirements.txt
+pip install $WORKSPACE
 
-
-pip install -e $WORKSPACE
-
-python $WORKSPACE/setup.py develop
+#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-package=functest.core.testcase_base \
-         --cover-package=functest.opnfv_tests.sdn.odl.odl \
+         --cover-tests \
+         --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