openstack/zaqar
Code Issues Proposed changes

Workaround pypy bug on trusty when running tests

Browse Source 
https://bitbucket.org/pypy/pypy/issue/1694/ affects zaqar when running
pypy tests on trusty slave nodes. We can work around that bug by setting
--jit off when running the pypy interpreter. Do this until the upstream
bug fix is backported into trusty.

Change-Id: Iebaa167e9e12bbc1017371929ca8c182bacc2aad
Related-Bug: 1368418
This commit is contained in:
Clark Boylan 2014-09-11 11:51:01 -07:00
parent ab3a4fb17f
commit a72a0bd988
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.testr.conf
View File

@ -2,7 +2,7 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t . ./tests $LISTOPT $IDOPTION ${PYTHON:-python} $JIT_FLAG -m subunit.run discover -t . ./tests $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

6
tox.ini
View File

@ -27,6 +27,12 @@ deps = -r{toxinidir}/requirements-py3.txt
deps = -r{toxinidir}/requirements-py3.txt deps = -r{toxinidir}/requirements-py3.txt
-r{toxinidir}/test-requirements-py3.txt -r{toxinidir}/test-requirements-py3.txt
[testenv:pypy]
setenv = VIRTUAL_ENV={envdir}
ZAQAR_TESTS_DIR={toxinidir}/tests
ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
JIT_FLAG=--jit off
[tox:jenkins] [tox:jenkins]
downloadcache = ~/cache/pip downloadcache = ~/cache/pip