Merge "Fix tox not performing some tests in some Envs"

This commit is contained in:
Jenkins 2015-11-18 18:09:44 +00:00 committed by Gerrit Code Review
commit 740aa9f0c6

18
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 1.6 minversion = 1.6
envlist = py26,py27,py33,py34,pypy,pep8 envlist = py27,py34,pypy,pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -9,25 +9,19 @@ usedevelop = True
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/ ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/
ZAQAR_TEST_MONGODB=1
ZAQAR_TEST_SLOW=1
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}' commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}'
[testenv:py27]
setenv = ZAQAR_TEST_MONGODB=1
ZAQAR_TEST_SLOW=1
{[testenv]setenv}
[testenv:pypy] [testenv:pypy]
setenv = JIT_FLAG=--jit off setenv = {[testenv]setenv}
{[testenv]setenv} JIT_FLAG=--jit off
[testenv:integration] [testenv:integration]
setenv = ZAQAR_TEST_MONGODB=1 setenv = {[testenv]setenv}
ZAQAR_TEST_SLOW=1
ZAQAR_TEST_INTEGRATION=1 ZAQAR_TEST_INTEGRATION=1
{[testenv]setenv}
commands = python setup.py testr --slowest --testr-args='--concurrency 1 zaqar.tests.functional' commands = python setup.py testr --slowest --testr-args='--concurrency 1 zaqar.tests.functional'
[tox:jenkins] [tox:jenkins]