removing pexpect from general dependencies because

it doesn't install on windows anymore.  Instead
to specific configurations for pexpect on py27 and py33
which only call the tests that need it.
This commit is contained in:
holger krekel 2013-11-20 20:00:59 +01:00
parent 6d1b7e94d1
commit bd8a2cc18c
1 changed files with 15 additions and 3 deletions

18
tox.ini
View File

@ -1,12 +1,11 @@
[tox] [tox]
distshare={homedir}/.tox/distshare distshare={homedir}/.tox/distshare
envlist=flakes,py25,py26,py27,pypy,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial envlist=flakes,py25,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
[testenv] [testenv]
changedir=testing changedir=testing
commands= py.test --lsof -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] commands= py.test --lsof -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
deps= deps=
pexpect
nose nose
[testenv:genscript] [testenv:genscript]
@ -41,6 +40,20 @@ commands=
py.test -n3 -rfsxX \ py.test -n3 -rfsxX \
--junitxml={envlogdir}/junit-{envname}.xml testing --junitxml={envlogdir}/junit-{envname}.xml testing
[testenv:py27-pexpect]
changedir=testing
basepython=python2.7
deps=pexpect
commands=
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
[testenv:py33-pexpect]
changedir=testing
basepython=python2.7
deps={[testenv:py27-pexpect]deps}
commands=
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
[testenv:py27-nobyte] [testenv:py27-nobyte]
changedir=. changedir=.
basepython=python2.7 basepython=python2.7
@ -55,7 +68,6 @@ commands=
[testenv:trial] [testenv:trial]
changedir=. changedir=.
deps=twisted deps=twisted
pexpect
commands= commands=
py.test -rsxf \ py.test -rsxf \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py} --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}