diff --git a/tox.ini b/tox.ini index fa18c9eb5bb..02056e0bee6 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = sh commands = - dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin {toxinidir}/tools/ostestr_compat_shim.sh {posargs} # there is also secret magic in ostestr which lets you run in a fail only # mode. To do this define the TRACE_FAILONLY environmental variable. @@ -81,6 +80,9 @@ setenv = {[testenv:functional]setenv} sitepackages=True deps = {[testenv:functional]deps} +commands = + {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin + {toxinidir}/tools/ostestr_compat_shim.sh {posargs} [testenv:dsvm-functional-constraints] basepython = {[testenv:dsvm-functional]basepython} @@ -89,6 +91,9 @@ setenv = {[testenv:dsvm-functional]setenv} sitepackages={[testenv:dsvm-functional]sitepackages} deps = {[testenv:functional-constraints]deps} +commands = + {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin + {toxinidir}/tools/ostestr_compat_shim.sh {posargs} [testenv:dsvm-functional-py34] basepython = python3.4 @@ -96,6 +101,9 @@ setenv = {[testenv:dsvm-functional]setenv} sitepackages={[testenv:dsvm-functional]sitepackages} deps = {[testenv:dsvm-functional]deps} +commands = + {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin + {toxinidir}/tools/ostestr_compat_shim.sh {posargs} [testenv:dsvm-fullstack] setenv = {[testenv]setenv}