Merge "Lifted requirements.pip one level up to meet the basic structure of OpenStack...
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 28 Nov 2016 16:34:17 +0000 (16:34 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 28 Nov 2016 16:34:17 +0000 (16:34 +0000)
1  2 
run_unit_tests.sh

diff --combined run_unit_tests.sh
@@@ -43,7 -43,7 +43,7 @@@ source $WORKSPACE/functest_venv/bin/act
  # install python packages
  easy_install -U setuptools
  easy_install -U pip
- pip install -r $WORKSPACE/docker/requirements.pip
+ pip install -r $WORKSPACE/requirements.txt
  pip install -e $WORKSPACE
  
  python $WORKSPACE/setup.py develop
@@@ -56,7 -56,7 +56,7 @@@ nosetests --with-xunit 
           --with-coverage \
           --cover-erase \
           --cover-package=functest.core.TestCasesBase \
 -         --cover-package=functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting \
 +         --cover-package=functest.opnfv_tests.sdn.odl.odl \
           --cover-xml \
           --cover-html \
           functest/tests/unit