X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Frun_test.sh;h=1e05dd6ba2c0eb5a2604e1bc2a26b853fe4a6fd6;hb=5b77ae789540f805199831427930476c9579916b;hp=d1f05f2011067b7ae053813abfab6568560c393d;hpb=aa51cedd14432be1bc9a9f6e97ca2abc077ba23f;p=releng.git diff --git a/utils/test/testapi/run_test.sh b/utils/test/testapi/run_test.sh index d1f05f201..1e05dd6ba 100755 --- a/utils/test/testapi/run_test.sh +++ b/utils/test/testapi/run_test.sh @@ -5,20 +5,20 @@ set -o errexit # Get script directory SCRIPTDIR=`dirname $0` -# Either Workspace is set (CI) -if [ -z $WORKSPACE ] -then - WORKSPACE="." -fi - echo "Running unit tests..." # Creating virtual environment -virtualenv $WORKSPACE/testapi_venv -source $WORKSPACE/testapi_venv/bin/activate +if [ ! -z $VIRTUAL_ENV ]; then + venv=$VIRTUAL_ENV +else + venv=$SCRIPTDIR/.venv + virtualenv $venv +fi +source $venv/bin/activate # Install requirements pip install -r $SCRIPTDIR/requirements.txt +pip install -r $SCRIPTDIR/test-requirements.txt find . -type f -name "*.pyc" -delete @@ -26,7 +26,7 @@ nosetests --with-xunit \ --with-coverage \ --cover-erase \ --cover-package=$SCRIPTDIR/opnfv_testapi/cmd \ - --cover-package=$SCRIPTDIR/opnfv_testapi/commonn \ + --cover-package=$SCRIPTDIR/opnfv_testapi/common \ --cover-package=$SCRIPTDIR/opnfv_testapi/resources \ --cover-package=$SCRIPTDIR/opnfv_testapi/router \ --cover-xml \