diff options
Diffstat (limited to 'conductor/tox.ini')
| -rw-r--r-- | conductor/tox.ini | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/conductor/tox.ini b/conductor/tox.ini index 25ede20..a6aa070 100644 --- a/conductor/tox.ini +++ b/conductor/tox.ini @@ -2,8 +2,9 @@ minversion = 1.6 skipsdist = True #envlist = py35,py27,functional,pep8 -envlist = py27,pep8 +envlist = py3,pep8 [testenv] +basepython=python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install -U {opts} {packages} @@ -12,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=conductor/tests/unit passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE commands = - {toxinidir}/tools/pretty_tox.sh "{posargs}" + coverage run --module pytest --junitxml xunit-results.xml oslo-config-generator --config-file=etc/conductor/conductor-config-generator.conf whitelist_externals = bash find @@ -33,16 +34,15 @@ commands = coverage erase find . -type f -name "*.pyc" -delete find . -type f -name ".coverage.*" -delete - {toxinidir}/tools/pretty_tox.sh "{posargs}" - coverage combine + coverage run --module pytest --junitxml xunit-results.xml coverage html -d cover coverage xml -o cover/coverage.xml - coverage report --omit=".tox/py27/*","conductor/tests/*" + coverage report --omit=".tox/*","conductor/tests/*" [testenv:pep8] -deps = hacking<0.12,>=0.11.0 +deps = hacking>=2.0.0 commands = - flake8 + flake8 --exit-zero [testenv:genconfig] commands = oslo-config-generator --config-file=etc/conductor/conductor-config-generator.conf |