From bee3926423d2fb666589cb43396f9c52778eef2c Mon Sep 17 00:00:00 2001 From: Eva Balycheva Date: Wed, 21 Oct 2015 18:54:59 +0300 Subject: [PATCH] Fix tox not performing some tests in some Envs Many tests are being skipped while testing using tox in some environments. That's because some important environment variables are not defined for these environments: pypy, py34. The variables are: ZAQAR_TEST_MONGODB=1 ZAQAR_TEST_SLOW=1 This change defines these environment variables in tox.ini. And not only for the few environments that need such variables, but for all environments. Because it's the most simple way to do it in which I see no harm. Also this change deletes deprecated python environments (py26 and py33) from the list of environments. Depends-On: I37937ffe9b71323a92880f678e84c7c24e6872d6 Change-Id: I3a8cef038ed9a37c8dc29850dfdda31b72c05883 Closes-Bug: 1508519 --- tox.ini | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tox.ini b/tox.ini index 01f2bf46a..9a8360fbb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py26,py27,py33,py34,pypy,pep8 +envlist = py27,py34,pypy,pep8 skipsdist = True [testenv] @@ -9,25 +9,19 @@ usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/ - + ZAQAR_TEST_MONGODB=1 + ZAQAR_TEST_SLOW=1 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt 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] -setenv = JIT_FLAG=--jit off - {[testenv]setenv} +setenv = {[testenv]setenv} + JIT_FLAG=--jit off [testenv:integration] -setenv = ZAQAR_TEST_MONGODB=1 - ZAQAR_TEST_SLOW=1 +setenv = {[testenv]setenv} ZAQAR_TEST_INTEGRATION=1 - {[testenv]setenv} commands = python setup.py testr --slowest --testr-args='--concurrency 1 zaqar.tests.functional' [tox:jenkins]