pull pytest from testrun for py26

This commit is contained in:
holger krekel
2011-07-07 23:14:34 +02:00
parent b04616419e
commit 1c2563d864

12
tox.ini
View File

@@ -1,18 +1,22 @@
[tox] [tox]
envlist=py26,py31,py27,py25,py24 envlist=py26,py31,py27,py25,py24
indexserver= indexserver=
default = http://pypi.testrun.org testrun = http://pypi.testrun.org
pypi = http://pypi.python.org/simple pypi = http://pypi.python.org/simple
[testenv] [testenv]
changedir=testing changedir=testing
deps=pytest deps=:testrun:pytest
commands= py.test --junitxml={envlogdir}/junit-{envname}.xml [] commands= py.test --junitxml={envlogdir}/junit-{envname}.xml []
[testenv:py31]
deps=:pypi:pytest # XXX needed because ClueRelease/pip broken
[testenv:py32]
deps=:pypi:pytest # XXX needed because ClueRelease/pip broken
[testenv:py26] [testenv:py26]
deps= deps=
pytest :testrun:pytest
:pypi:pexpect :pypi:pexpect
[pytest] [pytest]