diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 69f83f4..5cf2d12 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -256,6 +256,7 @@ class TestDistribution: time.sleep(10) """) child = testdir.spawn_pytest("-n1") + py.std.time.sleep(0.1) child.expect(".*test session starts.*") child.kill(2) # keyboard interrupt child.expect(".*KeyboardInterrupt.*") diff --git a/tox.ini b/tox.ini index 6a79a2c..b6fe71a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,25 +1,26 @@ [tox] -envlist=py26,py32,py33,py27,py26,py26-old,py33-old +envlist=py26,py32,py33,py27,py27-pexpect,py33-pexpect,py26,py26-old,py33-old [testenv] changedir=testing deps=pytest>=2.5.1 commands= py.test --junitxml={envlogdir}/junit-{envname}.xml [] -[testenv:py27] -deps= - pytest>=2.4.2 +[testenv:py27-pexpect] +deps={[testenv]deps} + pexpect +[testenv:py33-pexpect] +deps={[testenv]deps} pexpect [testenv:py26-old] deps= - pytest==2.3.5 - pexpect + pytest==2.4.2 [testenv:py33-old] basepython = python3.3 deps= - pytest==2.3.5 + pytest==2.4.2 [pytest] addopts = -rsfxX