From bd8a2cc18c1898673665023556e73134e78e4d75 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 20 Nov 2013 20:00:59 +0100 Subject: [PATCH] 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. --- tox.ini | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 9ec5b9a83..e676b71b7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] 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] changedir=testing commands= py.test --lsof -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] deps= - pexpect nose [testenv:genscript] @@ -41,6 +40,20 @@ commands= py.test -n3 -rfsxX \ --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] changedir=. basepython=python2.7 @@ -55,7 +68,6 @@ commands= [testenv:trial] changedir=. deps=twisted - pexpect commands= py.test -rsxf \ --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}