diff --git a/tox.ini b/tox.ini index b9ade44a80..281adaa025 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = docs,py35,py34,py27,pep8,specs +envlist = docs,py35,py34,py27,functional,pep8,specs skipsdist = True [testenv] @@ -18,11 +18,25 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:cover] -commands = python setup.py testr --coverage --testr-args='{posargs}' +whitelist_externals = sh +commands = + sh -c 'COVERAGE_FILE={toxinidir}/.coverage-py27 python setup.py testr --coverage --testr-args='{posargs}'' + sh -c 'COVERAGE_FILE={toxinidir}/.coverage-functional OS_TEST_PATH={toxinidir}/octavia/tests/functional python setup.py testr --coverage --testr-args='{posargs}'' + sh -c 'ls -al' + coverage combine --debug=dataio {toxinidir}/.coverage-py27 {toxinidir}/.coverage-functional + coverage html -d cover [testenv:functional] setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional +[testenv:functional-py34] +basepython = python3.4 +setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional + +[testenv:functional-py35] +basepython = python3.5 +setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional + [testenv:debug] commands = oslo_debug_helper {posargs}