X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_unit_tests.sh;h=d60a2d623fc9bce94a8e97d1cd74cd2ef21d5f5e;hb=e9334da17298cfeff4ccfb079bb3e3908e85c0e2;hp=bbe95cc8cc8e2a5c8087a2d7330e66ac5ee85bc9;hpb=82f18a401cee8c6f4a2395c6185052c2fcd0ba16;p=functest.git

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index bbe95cc8c..d60a2d623 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -2,48 +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)
-# then useless log files must belong to jenkins:jenkins
-# or it is local tests and we do not care
 if [ -z $WORKSPACE ]
 then
-    WORKSPACE="."
-else
-    sudo chown -Rf jenkins:jenkins /home/opnfv
-    # as we import the module from the home repo
-    # and in jenkins the name is different
-    # functest-verify-master != functest
-    # make some ugly adjustments...
-    cd $WORKSPACE
-    export PYTHONPATH="${PYTHONPATH}:$WORKSPACE"
-    cd ..
-
-    if [ ! -d "./functest" ]
-    then
-    ln -s functest-verify-master functest
-    fi
+    WORKSPACE=`pwd`
 fi
 
 
@@ -57,42 +19,37 @@ virtualenv $WORKSPACE/functest_venv
 source $WORKSPACE/functest_venv/bin/activate
 
 # install python packages
-easy_install -U setuptools
-easy_install -U pip
-pip install -r $WORKSPACE/docker/requirements.pip
-pip install -e $WORKSPACE
-
-python $WORKSPACE/setup.py develop
-
+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
+
+#install releng
+cd $WORKSPACE/../
+git clone https://gerrit.opnfv.org/gerrit/releng
+pip install releng/modules/
+rm -fr releng
+cd $WORKSPACE
+
+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.TestCasesBase \
-         --cover-package=functest.testcases.Controllers.ODL.OpenDaylightTesting \
+         --cover-tests \
+         --cover-package=functest.cli \
+         --cover-package=functest.core.testcase_base \
+         --cover-package=functest.opnfv_tests.sdn.odl.odl \
+         --cover-package=functest.utils \
+         --cover-package=functest.opnfv_tests.openstack.rally \
          --cover-xml \
          --cover-html \
-         unit_tests
+         --log-config=$(pwd)/functest/tests/unit/test_logging.ini \
+         functest/tests/unit
 rc=$?
 
 deactivate
 
-# *******
-# clean
-# *******
-# First as we had to start the test from ..
-# Push the results upstream for jenkins
-if [ $WORKSPACE != "." ]
-then
-    mv coverage.xml nosetests.xml $WORKSPACE
-fi
-
-# Clean useless logs
-if [ -d "/home/opnfv/functest/results" ]
-then
-    sudo rm -rf /home/opnfv/functest/results
-fi
-
 exit $rc