Remove old tempest implementation

[functest.git] / run_unit_tests.sh

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 96b4a58..71d21c9 100755 (executable)
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -18,35 +18,16 @@ fi
 # Create log dir if needed
 # log shall be disabled during unit tests
 # fix to be done in Logger
-if [ ! -d "/home/opnfv/functest/results" ]
-then
-    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
-fi
+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
 fi
 
 
@@ -60,24 +41,24 @@ 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
 
+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.core.testcase_base \
+         --cover-package=functest.opnfv_tests.sdn.odl.odl \
          --cover-xml \
          --cover-html \
-         unit_tests
+         functest/tests/unit
 rc=$?
 
 deactivate
@@ -85,13 +66,6 @@ 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