Merge pull request #422 from blueyed/usepdb
Use default with usepdb option
This commit is contained in:
@@ -30,7 +30,7 @@ def pytest_addoption(parser):
|
|||||||
def pytest_cmdline_main(config):
|
def pytest_cmdline_main(config):
|
||||||
|
|
||||||
if config.getoption("looponfail"):
|
if config.getoption("looponfail"):
|
||||||
usepdb = config.getoption("usepdb") # a core option
|
usepdb = config.getoption("usepdb", False) # a core option
|
||||||
if usepdb:
|
if usepdb:
|
||||||
raise pytest.UsageError("--pdb is incompatible with --looponfail.")
|
raise pytest.UsageError("--pdb is incompatible with --looponfail.")
|
||||||
looponfail_main(config)
|
looponfail_main(config)
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ def pytest_configure(config):
|
|||||||
|
|
||||||
@pytest.mark.tryfirst
|
@pytest.mark.tryfirst
|
||||||
def pytest_cmdline_main(config):
|
def pytest_cmdline_main(config):
|
||||||
usepdb = config.getoption("usepdb") # a core option
|
usepdb = config.getoption("usepdb", False) # a core option
|
||||||
if isinstance(config.option.numprocesses, AutoInt):
|
if isinstance(config.option.numprocesses, AutoInt):
|
||||||
config.option.numprocesses = 0 if usepdb else int(config.option.numprocesses)
|
config.option.numprocesses = 0 if usepdb else int(config.option.numprocesses)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user