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

adapt to pytest changes, add looponfailingdirs ini-option

Browse Source
This commit is contained in:
holger krekel
2010-11-06 09:58:00 +01:00
parent 985c9163b7
commit 9d55d3c831
9 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xdist/plugin.py
View File

@@ -142,7 +142,7 @@ where the configuration file was found.
"""
import sys
import py
import py, pytest
def pytest_addoption(parser):
group = parser.getgroup("xdist", "distributed and subprocess testing")
@@ -178,6 +178,8 @@ def pytest_addoption(parser):
' remote distributed testing.', type="pathlist")
parser.addini('rsyncignore', 'list of (relative) paths to be ignored '
'for rsyncing.', type="pathlist")
parser.addini("looponfailroots", type="pathlist",
help="directories to check for changes", default=[py.path.local()])
# -------------------------------------------------------------------------
# distributed testing hooks
@@ -218,10 +220,10 @@ def check_options(config):
usepdb = config.option.usepdb # a core option
if val("looponfail"):
if usepdb:
raise config.Error("--pdb incompatible with --looponfail.")
raise pytest.UsageError("--pdb incompatible with --looponfail.")
elif val("dist") != "no":
if usepdb:
raise config.Error("--pdb incompatible with distributing tests.")
raise pytest.UsageError("--pdb incompatible with distributing tests.")
def pytest_runtest_protocol(item):