summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorJamie Lennox <jlennox@redhat.com>2013-05-30 17:44:54 +1000
committerJamie Lennox <jlennox@redhat.com>2013-06-05 10:02:26 +1000
commit7da3a698658bcc2188caa95ba2f735becd99caee (patch)
tree88fbfe10a4f7aea8acd936ee66dc6931c571d2a7 /tox.ini
parente183b93481de61d909abb9569841bd553e1ea489 (diff)
downloadkeystone-7da3a698658bcc2188caa95ba2f735becd99caee.tar.gz
keystone-7da3a698658bcc2188caa95ba2f735becd99caee.tar.xz
keystone-7da3a698658bcc2188caa95ba2f735becd99caee.zip
Import eventlet patch from oslo.
This was abandoned once before: https://review.openstack.org/#/c/25781/ However this is not to do with packaging. This is required if we use eventlet subprocess module (like we should be) in jenkins tests for python2.6. Also imports patch_tox_venv.py. This is a cutdown version of what would happen in run_tests.sh but for tox environments which is how jenkins runs tests now. Change-Id: I369c3e464dfbe3a754f90db58785e97ac87b36c0
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 2c6838bd..ddb167ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,8 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_STDOUT=1
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = nosetests {posargs}
+commands = python tools/patch_tox_venv.py
+ nosetests {posargs}
[testenv:pep8]
commands =