Tests: Unset PYTEST_XDIST_AUTO_NUM_WORKERS when the behavior without the envvar is asserted
This commit is contained in:
1
changelog/870.trivial
Normal file
1
changelog/870.trivial
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Make the tests pass even when ``$PYTEST_XDIST_AUTO_NUM_WORKERS`` is set.
|
||||||
@@ -54,6 +54,8 @@ def test_auto_detect_cpus(
|
|||||||
) -> None:
|
) -> None:
|
||||||
from xdist.plugin import pytest_cmdline_main as check_options
|
from xdist.plugin import pytest_cmdline_main as check_options
|
||||||
|
|
||||||
|
monkeypatch.delenv("PYTEST_XDIST_AUTO_NUM_WORKERS", raising=False)
|
||||||
|
|
||||||
with suppress(ImportError):
|
with suppress(ImportError):
|
||||||
import psutil
|
import psutil
|
||||||
|
|
||||||
@@ -101,6 +103,7 @@ def test_auto_detect_cpus_psutil(
|
|||||||
|
|
||||||
psutil = pytest.importorskip("psutil")
|
psutil = pytest.importorskip("psutil")
|
||||||
|
|
||||||
|
monkeypatch.delenv("PYTEST_XDIST_AUTO_NUM_WORKERS", raising=False)
|
||||||
monkeypatch.setattr(psutil, "cpu_count", lambda logical=True: 84 if logical else 42)
|
monkeypatch.setattr(psutil, "cpu_count", lambda logical=True: 84 if logical else 42)
|
||||||
|
|
||||||
config = pytester.parseconfigure("-nauto")
|
config = pytester.parseconfigure("-nauto")
|
||||||
@@ -117,6 +120,8 @@ def test_auto_detect_cpus_os(
|
|||||||
) -> None:
|
) -> None:
|
||||||
from xdist.plugin import pytest_cmdline_main as check_options
|
from xdist.plugin import pytest_cmdline_main as check_options
|
||||||
|
|
||||||
|
monkeypatch.delenv("PYTEST_XDIST_AUTO_NUM_WORKERS", raising=False)
|
||||||
|
|
||||||
config = pytester.parseconfigure("-nauto")
|
config = pytester.parseconfigure("-nauto")
|
||||||
check_options(config)
|
check_options(config)
|
||||||
assert config.getoption("numprocesses") == 3
|
assert config.getoption("numprocesses") == 3
|
||||||
@@ -178,6 +183,8 @@ def test_hook_auto_num_workers_none(
|
|||||||
# but we document it so let's test it.
|
# but we document it so let's test it.
|
||||||
from xdist.plugin import pytest_cmdline_main as check_options
|
from xdist.plugin import pytest_cmdline_main as check_options
|
||||||
|
|
||||||
|
monkeypatch.delenv("PYTEST_XDIST_AUTO_NUM_WORKERS", raising=False)
|
||||||
|
|
||||||
pytester.makeconftest(
|
pytester.makeconftest(
|
||||||
"""
|
"""
|
||||||
def pytest_xdist_auto_num_workers():
|
def pytest_xdist_auto_num_workers():
|
||||||
|
|||||||
Reference in New Issue
Block a user