Skip to content

Move checking of options to pytest_configure #502

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 3 commits into from
Closed

Move checking of options to pytest_configure #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4673759
test_pdb_can_be_used_before_configure
blueyed Feb 11, 2020
022e3e9
Move checking of options to pytest_configure
blueyed Feb 11, 2020
aa25427
tests: testdir.parseconfigure is enough
blueyed Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/xdist/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,20 +164,6 @@ def pytest_addhooks(pluginmanager):

@pytest.mark.trylast
def pytest_configure(config):
if config.getoption("dist") != "no" and not config.getvalue("collectonly"):
from xdist.dsession import DSession

session = DSession(config)
config.pluginmanager.register(session, "dsession")
tr = config.pluginmanager.getplugin("terminalreporter")
if tr:
tr.showfspath = False
if config.getoption("boxed"):
config.option.forked = True


@pytest.mark.tryfirst
def pytest_cmdline_main(config):
usepdb = config.getoption("usepdb", False) # a core option
if isinstance(config.option.numprocesses, AutoInt):
config.option.numprocesses = 0 if usepdb else int(config.option.numprocesses)
Expand All @@ -199,6 +185,17 @@ def pytest_cmdline_main(config):
"--pdb is incompatible with distributing tests; try using -n0 or -nauto."
) # noqa: E501

if config.getoption("dist") != "no" and not config.getvalue("collectonly"):
from xdist.dsession import DSession

session = DSession(config)
config.pluginmanager.register(session, "dsession")
tr = config.pluginmanager.getplugin("terminalreporter")
if tr:
tr.showfspath = False
if config.getoption("boxed"):
config.option.forked = True


# -------------------------------------------------------------------------
# fixtures
Expand Down
26 changes: 6 additions & 20 deletions testing/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,28 @@ def test_dist_incompatibility_messages(testdir):
assert "incompatible" in result.stderr.str()


def test_dist_options(testdir):
from xdist.plugin import pytest_cmdline_main as check_options
def test_pdb_can_be_used_before_configure(testdir):
result = testdir.runpytest("--pdb", "-n", "2", "--version")
assert result.ret == 0
assert "pytest version" in result.stderr.str()


def test_dist_options(testdir):
config = testdir.parseconfigure("-n 2")
check_options(config)
assert config.option.dist == "load"
assert config.option.tx == ["popen"] * 2
config = testdir.parseconfigure("--numprocesses", "2")
check_options(config)
assert config.option.dist == "load"
assert config.option.tx == ["popen"] * 2
config = testdir.parseconfigure("--numprocesses", "3", "--maxprocesses", "2")
check_options(config)
assert config.option.dist == "load"
assert config.option.tx == ["popen"] * 2
config = testdir.parseconfigure("-d")
check_options(config)
assert config.option.dist == "load"


def test_auto_detect_cpus(testdir, monkeypatch):
import os
from xdist.plugin import pytest_cmdline_main as check_options

if hasattr(os, "sched_getaffinity"):
monkeypatch.setattr(os, "sched_getaffinity", lambda _pid: set(range(99)))
Expand All @@ -54,7 +53,6 @@ def test_auto_detect_cpus(testdir, monkeypatch):
assert config.getoption("numprocesses") == 99

config = testdir.parseconfigure("-nauto", "--pdb")
check_options(config)
assert config.getoption("usepdb")
assert config.getoption("numprocesses") == 0

Expand All @@ -65,33 +63,21 @@ def test_auto_detect_cpus(testdir, monkeypatch):


def test_boxed_with_collect_only(testdir):
from xdist.plugin import pytest_cmdline_main as check_options

config = testdir.parseconfigure("-n1", "--boxed")
check_options(config)
assert config.option.forked

config = testdir.parseconfigure("-n1", "--collect-only")
check_options(config)
assert not config.option.forked

config = testdir.parseconfigure("-n1", "--boxed", "--collect-only")
check_options(config)
assert config.option.forked


def test_dsession_with_collect_only(testdir):
from xdist.plugin import pytest_cmdline_main as check_options
from xdist.plugin import pytest_configure as configure

config = testdir.parseconfigure("-n1")
check_options(config)
configure(config)
assert config.pluginmanager.hasplugin("dsession")

config = testdir.parseconfigure("-n1", "--collect-only")
check_options(config)
configure(config)
assert not config.pluginmanager.hasplugin("dsession")


Expand Down