IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make pexpect specific environments so that the canonical ones also run on windows. Also add a little sleep to a pexpect-related tests in the hope it helps the test consistently passing (Bah).

Browse Source
This commit is contained in:
holger krekel
2014-01-27 19:47:37 +01:00
parent ffa156ced5
commit ab987d512c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testing/acceptance_test.py
View File

@@ -256,6 +256,7 @@ class TestDistribution:
time.sleep(10) time.sleep(10)
""") """)
child = testdir.spawn_pytest("-n1") child = testdir.spawn_pytest("-n1")
py.std.time.sleep(0.1)
child.expect(".*test session starts.*") child.expect(".*test session starts.*")
child.kill(2) # keyboard interrupt child.kill(2) # keyboard interrupt
child.expect(".*KeyboardInterrupt.*") child.expect(".*KeyboardInterrupt.*")

15
tox.ini
View File

@@ -1,25 +1,26 @@
[tox] [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] [testenv]
changedir=testing changedir=testing
deps=pytest>=2.5.1 deps=pytest>=2.5.1
commands= py.test --junitxml={envlogdir}/junit-{envname}.xml [] commands= py.test --junitxml={envlogdir}/junit-{envname}.xml []
[testenv:py27] [testenv:py27-pexpect]
deps= deps={[testenv]deps}
pytest>=2.4.2 pexpect
[testenv:py33-pexpect]
deps={[testenv]deps}
pexpect pexpect
[testenv:py26-old] [testenv:py26-old]
deps= deps=
pytest==2.3.5 pytest==2.4.2
pexpect
[testenv:py33-old] [testenv:py33-old]
basepython = python3.3 basepython = python3.3
deps= deps=
pytest==2.3.5 pytest==2.4.2
[pytest] [pytest]
addopts = -rsfxX addopts = -rsfxX