Update test suite to modern pytest
- Use pytest>=6.2 features (same as install_requires). When we can require >=7, can fix some more typing omissions and version checks. - Replace testdir with pytester - Replace py.test with pytest - Replace tmpdir with tmp_path - Remove (almost) all other uses of py - Add some type annotations (not checked yet) Ref #722.
This commit is contained in:
Ran Benita
@@ -1,44 +1,46 @@
|
||||
from contextlib import suppress
|
||||
from pathlib import Path
|
||||
|
||||
import py
|
||||
import execnet
|
||||
from xdist.workermanage import NodeManager
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
def test_dist_incompatibility_messages(testdir):
|
||||
result = testdir.runpytest("--pdb", "--looponfail")
|
||||
def test_dist_incompatibility_messages(pytester: pytest.Pytester) -> None:
|
||||
result = pytester.runpytest("--pdb", "--looponfail")
|
||||
assert result.ret != 0
|
||||
result = testdir.runpytest("--pdb", "-n", "3")
|
||||
result = pytester.runpytest("--pdb", "-n", "3")
|
||||
assert result.ret != 0
|
||||
assert "incompatible" in result.stderr.str()
|
||||
result = testdir.runpytest("--pdb", "-d", "--tx", "popen")
|
||||
result = pytester.runpytest("--pdb", "-d", "--tx", "popen")
|
||||
assert result.ret != 0
|
||||
assert "incompatible" in result.stderr.str()
|
||||
|
||||
|
||||
def test_dist_options(testdir):
|
||||
def test_dist_options(pytester: pytest.Pytester) -> None:
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
|
||||
config = testdir.parseconfigure("-n 2")
|
||||
config = pytester.parseconfigure("-n 2")
|
||||
check_options(config)
|
||||
assert config.option.dist == "load"
|
||||
assert config.option.tx == ["popen"] * 2
|
||||
config = testdir.parseconfigure("--numprocesses", "2")
|
||||
config = pytester.parseconfigure("--numprocesses", "2")
|
||||
check_options(config)
|
||||
assert config.option.dist == "load"
|
||||
assert config.option.tx == ["popen"] * 2
|
||||
config = testdir.parseconfigure("--numprocesses", "3", "--maxprocesses", "2")
|
||||
config = pytester.parseconfigure("--numprocesses", "3", "--maxprocesses", "2")
|
||||
check_options(config)
|
||||
assert config.option.dist == "load"
|
||||
assert config.option.tx == ["popen"] * 2
|
||||
config = testdir.parseconfigure("-d")
|
||||
config = pytester.parseconfigure("-d")
|
||||
check_options(config)
|
||||
assert config.option.dist == "load"
|
||||
|
||||
|
||||
def test_auto_detect_cpus(testdir, monkeypatch):
|
||||
def test_auto_detect_cpus(
|
||||
pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
import os
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
|
||||
@@ -56,20 +58,20 @@ def test_auto_detect_cpus(testdir, monkeypatch):
|
||||
|
||||
monkeypatch.setattr(multiprocessing, "cpu_count", lambda: 99)
|
||||
|
||||
config = testdir.parseconfigure("-n2")
|
||||
config = pytester.parseconfigure("-n2")
|
||||
assert config.getoption("numprocesses") == 2
|
||||
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
config = pytester.parseconfigure("-nauto")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 99
|
||||
|
||||
config = testdir.parseconfigure("-nauto", "--pdb")
|
||||
config = pytester.parseconfigure("-nauto", "--pdb")
|
||||
check_options(config)
|
||||
assert config.getoption("usepdb")
|
||||
assert config.getoption("numprocesses") == 0
|
||||
assert config.getoption("dist") == "no"
|
||||
|
||||
config = testdir.parseconfigure("-nlogical", "--pdb")
|
||||
config = pytester.parseconfigure("-nlogical", "--pdb")
|
||||
check_options(config)
|
||||
assert config.getoption("usepdb")
|
||||
assert config.getoption("numprocesses") == 0
|
||||
@@ -77,91 +79,95 @@ def test_auto_detect_cpus(testdir, monkeypatch):
|
||||
|
||||
monkeypatch.delattr(os, "sched_getaffinity", raising=False)
|
||||
monkeypatch.setenv("TRAVIS", "true")
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
config = pytester.parseconfigure("-nauto")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 2
|
||||
|
||||
|
||||
def test_auto_detect_cpus_psutil(testdir, monkeypatch):
|
||||
def test_auto_detect_cpus_psutil(
|
||||
pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
|
||||
psutil = pytest.importorskip("psutil")
|
||||
|
||||
monkeypatch.setattr(psutil, "cpu_count", lambda logical=True: 84 if logical else 42)
|
||||
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
config = pytester.parseconfigure("-nauto")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 42
|
||||
|
||||
config = testdir.parseconfigure("-nlogical")
|
||||
config = pytester.parseconfigure("-nlogical")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 84
|
||||
|
||||
|
||||
def test_hook_auto_num_workers(testdir, monkeypatch):
|
||||
def test_hook_auto_num_workers(
|
||||
pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
|
||||
testdir.makeconftest(
|
||||
pytester.makeconftest(
|
||||
"""
|
||||
def pytest_xdist_auto_num_workers():
|
||||
return 42
|
||||
"""
|
||||
)
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
config = pytester.parseconfigure("-nauto")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 42
|
||||
|
||||
config = testdir.parseconfigure("-nlogical")
|
||||
config = pytester.parseconfigure("-nlogical")
|
||||
check_options(config)
|
||||
assert config.getoption("numprocesses") == 42
|
||||
|
||||
|
||||
def test_boxed_with_collect_only(testdir):
|
||||
def test_boxed_with_collect_only(pytester: pytest.Pytester) -> None:
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
|
||||
config = testdir.parseconfigure("-n1", "--boxed")
|
||||
config = pytester.parseconfigure("-n1", "--boxed")
|
||||
check_options(config)
|
||||
assert config.option.forked
|
||||
|
||||
config = testdir.parseconfigure("-n1", "--collect-only")
|
||||
config = pytester.parseconfigure("-n1", "--collect-only")
|
||||
check_options(config)
|
||||
assert not config.option.forked
|
||||
|
||||
config = testdir.parseconfigure("-n1", "--boxed", "--collect-only")
|
||||
config = pytester.parseconfigure("-n1", "--boxed", "--collect-only")
|
||||
check_options(config)
|
||||
assert config.option.forked
|
||||
|
||||
|
||||
def test_dsession_with_collect_only(testdir):
|
||||
def test_dsession_with_collect_only(pytester: pytest.Pytester) -> None:
|
||||
from xdist.plugin import pytest_cmdline_main as check_options
|
||||
from xdist.plugin import pytest_configure as configure
|
||||
|
||||
config = testdir.parseconfigure("-n1")
|
||||
config = pytester.parseconfigure("-n1")
|
||||
check_options(config)
|
||||
configure(config)
|
||||
assert config.pluginmanager.hasplugin("dsession")
|
||||
|
||||
config = testdir.parseconfigure("-n1", "--collect-only")
|
||||
config = pytester.parseconfigure("-n1", "--collect-only")
|
||||
check_options(config)
|
||||
configure(config)
|
||||
assert not config.pluginmanager.hasplugin("dsession")
|
||||
|
||||
|
||||
def test_testrunuid_provided(testdir):
|
||||
config = testdir.parseconfigure("--testrunuid", "test123", "--tx=popen")
|
||||
def test_testrunuid_provided(pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--testrunuid", "test123", "--tx=popen")
|
||||
nm = NodeManager(config)
|
||||
assert nm.testrunuid == "test123"
|
||||
|
||||
|
||||
def test_testrunuid_generated(testdir):
|
||||
config = testdir.parseconfigure("--tx=popen")
|
||||
def test_testrunuid_generated(pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--tx=popen")
|
||||
nm = NodeManager(config)
|
||||
assert len(nm.testrunuid) == 32
|
||||
|
||||
|
||||
class TestDistOptions:
|
||||
def test_getxspecs(self, testdir):
|
||||
config = testdir.parseconfigure("--tx=popen", "--tx", "ssh=xyz")
|
||||
def test_getxspecs(self, pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--tx=popen", "--tx", "ssh=xyz")
|
||||
nodemanager = NodeManager(config)
|
||||
xspecs = nodemanager._getxspecs()
|
||||
assert len(xspecs) == 2
|
||||
@@ -169,39 +175,39 @@ class TestDistOptions:
|
||||
assert xspecs[0].popen
|
||||
assert xspecs[1].ssh == "xyz"
|
||||
|
||||
def test_xspecs_multiplied(self, testdir):
|
||||
config = testdir.parseconfigure("--tx=3*popen")
|
||||
def test_xspecs_multiplied(self, pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--tx=3*popen")
|
||||
xspecs = NodeManager(config)._getxspecs()
|
||||
assert len(xspecs) == 3
|
||||
assert xspecs[1].popen
|
||||
|
||||
def test_getrsyncdirs(self, testdir):
|
||||
config = testdir.parseconfigure("--rsyncdir=" + str(testdir.tmpdir))
|
||||
def test_getrsyncdirs(self, pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--rsyncdir=" + str(pytester.path))
|
||||
nm = NodeManager(config, specs=[execnet.XSpec("popen")])
|
||||
assert not nm._getrsyncdirs()
|
||||
nm = NodeManager(config, specs=[execnet.XSpec("popen//chdir=qwe")])
|
||||
assert nm.roots
|
||||
assert testdir.tmpdir in nm.roots
|
||||
assert pytester.path in nm.roots
|
||||
|
||||
def test_getrsyncignore(self, testdir):
|
||||
config = testdir.parseconfigure("--rsyncignore=fo*")
|
||||
def test_getrsyncignore(self, pytester: pytest.Pytester) -> None:
|
||||
config = pytester.parseconfigure("--rsyncignore=fo*")
|
||||
nm = NodeManager(config, specs=[execnet.XSpec("popen//chdir=qwe")])
|
||||
assert "fo*" in nm.rsyncoptions["ignores"]
|
||||
|
||||
def test_getrsyncdirs_with_conftest(self, testdir):
|
||||
p = py.path.local()
|
||||
for bn in "x y z".split():
|
||||
p.mkdir(bn)
|
||||
testdir.makeini(
|
||||
def test_getrsyncdirs_with_conftest(self, pytester: pytest.Pytester) -> None:
|
||||
p = Path.cwd()
|
||||
for bn in ("x", "y", "z"):
|
||||
p.joinpath(bn).mkdir()
|
||||
pytester.makeini(
|
||||
"""
|
||||
[pytest]
|
||||
rsyncdirs= x
|
||||
"""
|
||||
)
|
||||
config = testdir.parseconfigure(testdir.tmpdir, "--rsyncdir=y", "--rsyncdir=z")
|
||||
config = pytester.parseconfigure(pytester.path, "--rsyncdir=y", "--rsyncdir=z")
|
||||
nm = NodeManager(config, specs=[execnet.XSpec("popen//chdir=xyz")])
|
||||
roots = nm._getrsyncdirs()
|
||||
# assert len(roots) == 3 + 1 # pylib
|
||||
assert py.path.local("y") in roots
|
||||
assert py.path.local("z") in roots
|
||||
assert testdir.tmpdir.join("x") in roots
|
||||
assert Path("y").resolve() in roots
|
||||
assert Path("z").resolve() in roots
|
||||
assert pytester.path.joinpath("x") in roots
|
||||
|
||||
Reference in New Issue
Block a user