summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 7 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 747197a..b15b71e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
envlist = py26,py27,pep8,functest,ksfunctest
[testenv]
+whitelist_externals=bash
setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
@@ -21,13 +22,11 @@ downloadcache = ~/cache/pip
[testenv:functest]
changedir = {toxinidir}
-whitelist_externals=bash
commands = bash tools/functional_tests.sh
bash tools/gswauth_functional_tests.sh
[testenv:ksfunctest]
changedir = {toxinidir}
-whitelist_externals=bash
commands = bash tools/keystone_functional_tests.sh
[testenv:pep8]
@@ -43,7 +42,12 @@ commands =
setenv = NOSE_WITH_COVERAGE=1
[testenv:venv]
-commands = {posargs}
+commands =
+changedir = {toxinidir}
+
+[testenv:run]
+changedir = {toxinidir}
+commands = bash tools/tox_run.sh
[flake8]
ignore = H