summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tox.ini33
1 files changed, 9 insertions, 24 deletions
diff --git a/tox.ini b/tox.ini
index e2af720..553ff56 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,40 +74,25 @@ commands = nosetests -v tests/pecantest
basepython = python2.6
deps = -egit+http://git.openstack.org/cgit/openstack/ceilometer@stable/havana#egg=ceilometer
changedir = {envdir}/src/ceilometer
-usedevelop = True
-setenv = VIRTUAL_ENV={envdir}
- LANG=en_US.UTF-8
- LANGUAGE=en_US:en
- LC_ALL=C
- EVENTLET_NO_GREENDNS=yes
-install_command = pip install -U {opts} {packages}
-commands = pip install -vrrequirements.txt
- pip install -vrtest-requirements.txt
- bash -x run-tests.sh {posargs}
+commands = tox -e py26 --notest # ensure a virtualenv is built
+ {envdir}/src/ceilometer/.tox/py26/bin/pip install {toxinidir} # install pecan-dev
+ tox -e py26
[testenv:ceilometer-tip]
basepython = python2.6
deps = -egit+http://git.openstack.org/cgit/openstack/ceilometer#egg=ceilometer
changedir = {envdir}/src/ceilometer
-usedevelop = True
-setenv = VIRTUAL_ENV={envdir}
- LANG=en_US.UTF-8
- LANGUAGE=en_US:en
- LC_ALL=C
- EVENTLET_NO_GREENDNS=yes
-install_command = pip install -U {opts} {packages}
-commands = pip install -vrrequirements.txt
- pip install -vrtest-requirements.txt
- bash -x run-tests.sh {posargs}
+commands = tox -e py26 --notest # ensure a virtualenv is built
+ {envdir}/src/ceilometer/.tox/py26/bin/pip install {toxinidir} # install pecan-dev
+ tox -e py26
[testenv:ironic-tip]
basepython = python2.7
deps = -egit+http://git.openstack.org/cgit/openstack/ironic#egg=ironic
changedir = {envdir}/src/ironic
-commands = pip install -vrrequirements.txt
- pip install -vrtest-requirements.txt
- {envpython} setup.py develop
- {envpython} setup.py testr --slowest --testr-args='{posargs}'
+commands = tox -e py27 --notest # ensure a virtualenv is built
+ {envdir}/src/ironic/.tox/py27/bin/pip install {toxinidir} # install pecan-dev
+ tox -e py27
[testenv:pep8]
deps = pep8