Rooba
/
rq
mirror of https://github.com/rq/rq.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix run_tests to use pytest. (#1033) 

Update tox.ini envlist.
This commit is contained in:
Wolfgang Langner 2019-01-22 01:39:43 +01:00 committed by Selwin Ong
parent 7893168c87
commit 972778d041
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run_tests
View File

@ -26,7 +26,7 @@ fi
# For use on build server, we need exit code to be representative of success/failure
if [ "$1" = '-x' ]; then
shift 1
/usr/bin/env python -m unittest discover -v -s tests $@ 2>&1
/usr/bin/env python -m pytest -v tests $@ 2>&1
else
/usr/bin/env python -m unittest discover -v -s tests $@ 2>&1 | egrep -v '^test_' | $safe_rg
/usr/bin/env python -m pytest -v tests $@ 2>&1 | egrep -v '^test_' | $safe_rg
fi

13
tox.ini
View File

@ -1,22 +1,15 @@
[tox]
envlist=py26,py27,py33,py34,py35,py36,py37,pypy,flake8
envlist=py27,py34,py35,py36,py37,pypy,flake8
[testenv]
commands=py.test --cov rq --durations=5 {posargs}
commands=pytest --cov rq --durations=5 {posargs}
deps=
pytest
pytest-cov
mock
[testenv:py26]
deps=
pytest
pytest-cov
unittest2
mock
[testenv:flake8]
basepython = python2.7
basepython = python3.6
deps =
flake8
commands =