diff --git a/run-functional-tests.sh b/run-functional-tests.sh deleted file mode 100755 index 0f3260d9..00000000 --- a/run-functional-tests.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -x -set -e -# Use a mongodb backend by default - -if [ -z $PANKO_TEST_BACKEND ]; then - PANKO_TEST_BACKEND="mongodb" -fi - -for backend in $PANKO_TEST_BACKEND; do - pifpaf run $backend ./tools/pretty_tox.sh $* -done diff --git a/tox.ini b/tox.ini index 3c1dbcd0..048570e7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py27,py34,functional,py34-functional,pep8 +envlist = py27,py34,pep8 [testenv] deps = -r{toxinidir}/requirements.txt @@ -51,21 +51,6 @@ commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}" setenv = OS_TEST_PATH=panko/tests/functional/ commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}" -[testenv:functional] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=panko/tests/functional/ -passenv = PANKO_* -commands = - bash -x {toxinidir}/run-functional-tests.sh "{posargs}" - -[testenv:py34-functional] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=panko/tests/functional/ -basepython = python3.4 -passenv = PANKO_* -commands = - bash -x {toxinidir}/run-functional-tests.sh "{posargs}" - # NOTE(chdent): The gabbi tests are also run under the other functional # tox targets. This target simply provides a target to directly run just # gabbi tests without needing to do discovery across the entire body of