Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa8037d365 | ||
|
|
13efbfba69 | ||
|
|
0b840f8726 | ||
|
|
0242acfa0a | ||
|
|
04c0265b6b | ||
|
|
7ab9cf1a7a | ||
|
|
875aed976e | ||
|
|
386c8eb416 | ||
|
|
fc8e1133ac | ||
|
|
89d07a5cf2 | ||
|
|
911dfdbcb6 | ||
|
|
ba434848f5 | ||
|
|
8960ee45c6 | ||
|
|
9f6754f64a | ||
|
|
2bcbdb6745 | ||
|
|
d9c43a0933 | ||
|
|
d753e53ee4 | ||
|
|
81309e8d69 | ||
|
|
26d0fcabf6 | ||
|
|
486fa25bcb | ||
|
|
bc44fea8a8 | ||
|
|
6d544cef9a | ||
|
|
93780dcccc | ||
|
|
ca58e5e7ed | ||
|
|
d8a794bc84 | ||
|
|
ca032692a8 | ||
|
|
ad5e35213d | ||
|
|
ab5f12f92e | ||
|
|
b28c3d98c5 | ||
|
|
b94dcfe4cd | ||
|
|
311554324a | ||
|
|
5bb35b0f26 | ||
|
|
47d271ad97 | ||
|
|
7fb7bd9d04 |
@@ -1,4 +1,4 @@
|
||||
sudo: false
|
||||
dist: xenial
|
||||
language: python
|
||||
|
||||
notifications:
|
||||
@@ -27,6 +27,9 @@ jobs:
|
||||
- stage: baseline
|
||||
python: '3.6'
|
||||
env: TOXENV=linting
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.cache/pre-commit
|
||||
- python: '3.6'
|
||||
env: TOXENV=py36-pytestlatest
|
||||
- python: '2.7'
|
||||
@@ -39,8 +42,6 @@ jobs:
|
||||
env: TOXENV=py35-pytestlatest
|
||||
- python: "3.7"
|
||||
env: TOXENV=py37-pytestlatest
|
||||
sudo: required
|
||||
dist: xenial
|
||||
- python: "2.7"
|
||||
env: TOXENV=py27-pytestmaster
|
||||
- python: "2.7"
|
||||
|
||||
@@ -1,3 +1,27 @@
|
||||
pytest-xdist 1.28.0 (2019-04-02)
|
||||
================================
|
||||
|
||||
Features
|
||||
--------
|
||||
|
||||
- `#426 <https://github.com/pytest-dev/pytest-xdist/issues/426>`_: ``pytest-xdist`` now uses the new ``pytest_report_to_serializable`` and ``pytest_report_from_serializable``
|
||||
hooks from ``pytest 4.4`` (still experimental). This will make report serialization more reliable and
|
||||
extensible.
|
||||
|
||||
This also means that ``pytest-xdist`` now requires ``pytest>=4.4``.
|
||||
|
||||
|
||||
pytest-xdist 1.27.0 (2019-02-15)
|
||||
================================
|
||||
|
||||
Features
|
||||
--------
|
||||
|
||||
- `#374 <https://github.com/pytest-dev/pytest-xdist/issues/374>`_: The new ``pytest_xdist_getremotemodule`` hook allows overriding the module run on remote nodes.
|
||||
|
||||
- `#415 <https://github.com/pytest-dev/pytest-xdist/issues/415>`_: Improve behavior of ``--numprocesses=auto`` to work well with ``--pdb`` option.
|
||||
|
||||
|
||||
pytest-xdist 1.26.1 (2019-01-28)
|
||||
================================
|
||||
|
||||
|
||||
2
setup.py
2
setup.py
@@ -1,6 +1,6 @@
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
install_requires = ["execnet>=1.1", "pytest>=3.6.0", "pytest-forked", "six"]
|
||||
install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
|
||||
|
||||
|
||||
with open("README.rst") as f:
|
||||
|
||||
@@ -36,6 +36,7 @@ def test_dist_options(testdir):
|
||||
|
||||
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)))
|
||||
@@ -52,6 +53,11 @@ def test_auto_detect_cpus(testdir, monkeypatch):
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
assert config.getoption("numprocesses") == 99
|
||||
|
||||
config = testdir.parseconfigure("-nauto", "--pdb")
|
||||
check_options(config)
|
||||
assert config.getoption("usepdb")
|
||||
assert config.getoption("numprocesses") == 0
|
||||
|
||||
monkeypatch.delattr(os, "sched_getaffinity", raising=False)
|
||||
monkeypatch.setenv("TRAVIS", "true")
|
||||
config = testdir.parseconfigure("-nauto")
|
||||
|
||||
@@ -3,8 +3,7 @@ import pprint
|
||||
import pytest
|
||||
import sys
|
||||
|
||||
from xdist.workermanage import WorkerController, unserialize_report
|
||||
from xdist.remote import serialize_report
|
||||
from xdist.workermanage import WorkerController
|
||||
import execnet
|
||||
import marshal
|
||||
|
||||
@@ -81,187 +80,17 @@ def test_remoteinitconfig(testdir):
|
||||
assert config2.pluginmanager.getplugin("terminal") in (-1, None)
|
||||
|
||||
|
||||
class TestReportSerialization:
|
||||
def test_xdist_longrepr_to_str_issue_241(self, testdir):
|
||||
testdir.makepyfile(
|
||||
"""
|
||||
import os
|
||||
def test_a(): assert False
|
||||
def test_b(): pass
|
||||
"""
|
||||
)
|
||||
testdir.makeconftest(
|
||||
"""
|
||||
def pytest_runtest_logreport(report):
|
||||
print(report.longrepr)
|
||||
"""
|
||||
)
|
||||
res = testdir.runpytest("-n1", "-s")
|
||||
res.stdout.fnmatch_lines(["*1 failed, 1 passed *"])
|
||||
|
||||
def test_xdist_report_longrepr_reprcrash_130(self, testdir):
|
||||
reprec = testdir.inline_runsource(
|
||||
"""
|
||||
import py
|
||||
def test_fail(): assert False, 'Expected Message'
|
||||
"""
|
||||
)
|
||||
reports = reprec.getreports("pytest_runtest_logreport")
|
||||
assert len(reports) == 3
|
||||
rep = reports[1]
|
||||
added_section = ("Failure Metadata", str("metadata metadata"), "*")
|
||||
rep.longrepr.sections.append(added_section)
|
||||
d = serialize_report(rep)
|
||||
check_marshallable(d)
|
||||
a = unserialize_report("testreport", d)
|
||||
# Check assembled == rep
|
||||
assert a.__dict__.keys() == rep.__dict__.keys()
|
||||
for key in rep.__dict__.keys():
|
||||
if key != "longrepr":
|
||||
assert getattr(a, key) == getattr(rep, key)
|
||||
assert rep.longrepr.reprcrash.lineno == a.longrepr.reprcrash.lineno
|
||||
assert rep.longrepr.reprcrash.message == a.longrepr.reprcrash.message
|
||||
assert rep.longrepr.reprcrash.path == a.longrepr.reprcrash.path
|
||||
assert rep.longrepr.reprtraceback.entrysep == a.longrepr.reprtraceback.entrysep
|
||||
assert (
|
||||
rep.longrepr.reprtraceback.extraline == a.longrepr.reprtraceback.extraline
|
||||
)
|
||||
assert rep.longrepr.reprtraceback.style == a.longrepr.reprtraceback.style
|
||||
assert rep.longrepr.sections == a.longrepr.sections
|
||||
# Missing section attribute PR171
|
||||
assert added_section in a.longrepr.sections
|
||||
|
||||
def test_reprentries_serialization_170(self, testdir):
|
||||
from _pytest._code.code import ReprEntry
|
||||
|
||||
reprec = testdir.inline_runsource(
|
||||
"""
|
||||
def test_repr_entry():
|
||||
x = 0
|
||||
assert x
|
||||
""",
|
||||
"--showlocals",
|
||||
)
|
||||
reports = reprec.getreports("pytest_runtest_logreport")
|
||||
assert len(reports) == 3
|
||||
rep = reports[1]
|
||||
d = serialize_report(rep)
|
||||
a = unserialize_report("testreport", d)
|
||||
|
||||
rep_entries = rep.longrepr.reprtraceback.reprentries
|
||||
a_entries = a.longrepr.reprtraceback.reprentries
|
||||
for i in range(len(a_entries)):
|
||||
assert isinstance(rep_entries[i], ReprEntry)
|
||||
assert rep_entries[i].lines == a_entries[i].lines
|
||||
assert rep_entries[i].reprfileloc.lineno == a_entries[i].reprfileloc.lineno
|
||||
assert (
|
||||
rep_entries[i].reprfileloc.message == a_entries[i].reprfileloc.message
|
||||
)
|
||||
assert rep_entries[i].reprfileloc.path == a_entries[i].reprfileloc.path
|
||||
assert rep_entries[i].reprfuncargs.args == a_entries[i].reprfuncargs.args
|
||||
assert rep_entries[i].reprlocals.lines == a_entries[i].reprlocals.lines
|
||||
assert rep_entries[i].style == a_entries[i].style
|
||||
|
||||
def test_reprentries_serialization_196(self, testdir):
|
||||
from _pytest._code.code import ReprEntryNative
|
||||
|
||||
reprec = testdir.inline_runsource(
|
||||
"""
|
||||
def test_repr_entry_native():
|
||||
x = 0
|
||||
assert x
|
||||
""",
|
||||
"--tb=native",
|
||||
)
|
||||
reports = reprec.getreports("pytest_runtest_logreport")
|
||||
assert len(reports) == 3
|
||||
rep = reports[1]
|
||||
d = serialize_report(rep)
|
||||
a = unserialize_report("testreport", d)
|
||||
|
||||
rep_entries = rep.longrepr.reprtraceback.reprentries
|
||||
a_entries = a.longrepr.reprtraceback.reprentries
|
||||
for i in range(len(a_entries)):
|
||||
assert isinstance(rep_entries[i], ReprEntryNative)
|
||||
assert rep_entries[i].lines == a_entries[i].lines
|
||||
|
||||
def test_itemreport_outcomes(self, testdir):
|
||||
reprec = testdir.inline_runsource(
|
||||
"""
|
||||
import py
|
||||
def test_pass(): pass
|
||||
def test_fail(): 0/0
|
||||
@py.test.mark.skipif("True")
|
||||
def test_skip(): pass
|
||||
def test_skip_imperative():
|
||||
py.test.skip("hello")
|
||||
@py.test.mark.xfail("True")
|
||||
def test_xfail(): 0/0
|
||||
def test_xfail_imperative():
|
||||
py.test.xfail("hello")
|
||||
"""
|
||||
)
|
||||
reports = reprec.getreports("pytest_runtest_logreport")
|
||||
assert len(reports) == 17 # with setup/teardown "passed" reports
|
||||
for rep in reports:
|
||||
d = serialize_report(rep)
|
||||
check_marshallable(d)
|
||||
newrep = unserialize_report("testreport", d)
|
||||
assert newrep.passed == rep.passed
|
||||
assert newrep.failed == rep.failed
|
||||
assert newrep.skipped == rep.skipped
|
||||
if newrep.skipped and not hasattr(newrep, "wasxfail"):
|
||||
assert len(newrep.longrepr) == 3
|
||||
assert newrep.outcome == rep.outcome
|
||||
assert newrep.when == rep.when
|
||||
assert newrep.keywords == rep.keywords
|
||||
if rep.failed:
|
||||
assert newrep.longreprtext == rep.longreprtext
|
||||
|
||||
def test_collectreport_passed(self, testdir):
|
||||
reprec = testdir.inline_runsource("def test_func(): pass")
|
||||
reports = reprec.getreports("pytest_collectreport")
|
||||
for rep in reports:
|
||||
d = serialize_report(rep)
|
||||
check_marshallable(d)
|
||||
newrep = unserialize_report("collectreport", d)
|
||||
assert newrep.passed == rep.passed
|
||||
assert newrep.failed == rep.failed
|
||||
assert newrep.skipped == rep.skipped
|
||||
|
||||
def test_collectreport_fail(self, testdir):
|
||||
reprec = testdir.inline_runsource("qwe abc")
|
||||
reports = reprec.getreports("pytest_collectreport")
|
||||
assert reports
|
||||
for rep in reports:
|
||||
d = serialize_report(rep)
|
||||
check_marshallable(d)
|
||||
newrep = unserialize_report("collectreport", d)
|
||||
assert newrep.passed == rep.passed
|
||||
assert newrep.failed == rep.failed
|
||||
assert newrep.skipped == rep.skipped
|
||||
if rep.failed:
|
||||
assert newrep.longrepr == str(rep.longrepr)
|
||||
|
||||
def test_extended_report_deserialization(self, testdir):
|
||||
reprec = testdir.inline_runsource("qwe abc")
|
||||
reports = reprec.getreports("pytest_collectreport")
|
||||
assert reports
|
||||
for rep in reports:
|
||||
rep.extra = True
|
||||
d = serialize_report(rep)
|
||||
check_marshallable(d)
|
||||
newrep = unserialize_report("collectreport", d)
|
||||
assert newrep.extra
|
||||
assert newrep.passed == rep.passed
|
||||
assert newrep.failed == rep.failed
|
||||
assert newrep.skipped == rep.skipped
|
||||
if rep.failed:
|
||||
assert newrep.longrepr == str(rep.longrepr)
|
||||
|
||||
|
||||
class TestWorkerInteractor:
|
||||
def test_basic_collect_and_runtests(self, worker):
|
||||
@pytest.fixture
|
||||
def unserialize_report(self, pytestconfig):
|
||||
def unserialize(data):
|
||||
return pytestconfig.hook.pytest_report_from_serializable(
|
||||
config=pytestconfig, data=data
|
||||
)
|
||||
|
||||
return unserialize
|
||||
|
||||
def test_basic_collect_and_runtests(self, worker, unserialize_report):
|
||||
worker.testdir.makepyfile(
|
||||
"""
|
||||
def test_func():
|
||||
@@ -286,14 +115,14 @@ class TestWorkerInteractor:
|
||||
ev = worker.popevent("testreport") # setup
|
||||
ev = worker.popevent("testreport")
|
||||
assert ev.name == "testreport"
|
||||
rep = unserialize_report(ev.name, ev.kwargs["data"])
|
||||
rep = unserialize_report(ev.kwargs["data"])
|
||||
assert rep.nodeid.endswith("::test_func")
|
||||
assert rep.passed
|
||||
assert rep.when == "call"
|
||||
ev = worker.popevent("workerfinished")
|
||||
assert "workeroutput" in ev.kwargs
|
||||
|
||||
def test_remote_collect_skip(self, worker):
|
||||
def test_remote_collect_skip(self, worker, unserialize_report):
|
||||
worker.testdir.makepyfile(
|
||||
"""
|
||||
import pytest
|
||||
@@ -305,25 +134,25 @@ class TestWorkerInteractor:
|
||||
assert not ev.kwargs
|
||||
ev = worker.popevent()
|
||||
assert ev.name == "collectreport"
|
||||
rep = unserialize_report(ev.name, ev.kwargs["data"])
|
||||
rep = unserialize_report(ev.kwargs["data"])
|
||||
assert rep.skipped
|
||||
assert rep.longrepr[2] == "Skipped: hello"
|
||||
ev = worker.popevent("collectionfinish")
|
||||
assert not ev.kwargs["ids"]
|
||||
|
||||
def test_remote_collect_fail(self, worker):
|
||||
def test_remote_collect_fail(self, worker, unserialize_report):
|
||||
worker.testdir.makepyfile("""aasd qwe""")
|
||||
worker.setup()
|
||||
ev = worker.popevent("collectionstart")
|
||||
assert not ev.kwargs
|
||||
ev = worker.popevent()
|
||||
assert ev.name == "collectreport"
|
||||
rep = unserialize_report(ev.name, ev.kwargs["data"])
|
||||
rep = unserialize_report(ev.kwargs["data"])
|
||||
assert rep.failed
|
||||
ev = worker.popevent("collectionfinish")
|
||||
assert not ev.kwargs["ids"]
|
||||
|
||||
def test_runtests_all(self, worker):
|
||||
def test_runtests_all(self, worker, unserialize_report):
|
||||
worker.testdir.makepyfile(
|
||||
"""
|
||||
def test_func(): pass
|
||||
@@ -345,7 +174,7 @@ class TestWorkerInteractor:
|
||||
for i in range(3): # setup/call/teardown
|
||||
ev = worker.popevent("testreport")
|
||||
assert ev.name == "testreport"
|
||||
rep = unserialize_report(ev.name, ev.kwargs["data"])
|
||||
rep = unserialize_report(ev.kwargs["data"])
|
||||
assert rep.nodeid.endswith(func)
|
||||
ev = worker.popevent("workerfinished")
|
||||
assert "workeroutput" in ev.kwargs
|
||||
@@ -457,6 +286,4 @@ def test_remote_usage_prog(testdir, request):
|
||||
|
||||
result = testdir.runpytest_subprocess("-n1")
|
||||
assert result.ret == 1
|
||||
result.stdout.fnmatch_lines(
|
||||
["usage: pytest.py *", "pytest.py: error: my_usage_error"]
|
||||
)
|
||||
result.stdout.fnmatch_lines(["*usage: *", "*error: my_usage_error"])
|
||||
|
||||
2
tox.ini
2
tox.ini
@@ -5,7 +5,6 @@ envlist=
|
||||
py{27,36}-pytest{master,features}
|
||||
|
||||
[testenv]
|
||||
changedir=testing
|
||||
passenv = USER USERNAME
|
||||
deps =
|
||||
pytestlatest: pytest
|
||||
@@ -36,6 +35,7 @@ commands =
|
||||
|
||||
[pytest]
|
||||
addopts = -ra
|
||||
testpaths = testing
|
||||
|
||||
[flake8]
|
||||
max-line-length = 120
|
||||
|
||||
@@ -30,7 +30,7 @@ def pytest_addoption(parser):
|
||||
def pytest_cmdline_main(config):
|
||||
|
||||
if config.getoption("looponfail"):
|
||||
usepdb = config.getoption("usepdb") # a core option
|
||||
usepdb = config.getoption("usepdb", False) # a core option
|
||||
if usepdb:
|
||||
raise pytest.UsageError("--pdb is incompatible with --looponfail.")
|
||||
looponfail_main(config)
|
||||
|
||||
@@ -30,6 +30,11 @@ def pytest_xdist_rsyncfinish(source, gateways):
|
||||
""" called after rsyncing a directory to remote gateways takes place. """
|
||||
|
||||
|
||||
@pytest.mark.firstresult
|
||||
def pytest_xdist_getremotemodule():
|
||||
""" called when creating remote node"""
|
||||
|
||||
|
||||
def pytest_configure_node(node):
|
||||
""" configure node information before it gets instantiated. """
|
||||
|
||||
|
||||
@@ -27,10 +27,14 @@ def auto_detect_cpus():
|
||||
return n if n else 1
|
||||
|
||||
|
||||
class AutoInt(int):
|
||||
"""Mark value as auto-detected."""
|
||||
|
||||
|
||||
def parse_numprocesses(s):
|
||||
if s == "auto":
|
||||
return auto_detect_cpus()
|
||||
else:
|
||||
return AutoInt(auto_detect_cpus())
|
||||
elif s is not None:
|
||||
return int(s)
|
||||
|
||||
|
||||
@@ -45,7 +49,7 @@ def pytest_addoption(parser):
|
||||
type=parse_numprocesses,
|
||||
help="shortcut for '--dist=load --tx=NUM*popen', "
|
||||
"you can use 'auto' here for auto detection CPUs number on "
|
||||
"host system",
|
||||
"host system and it will be 0 when used with --pdb",
|
||||
)
|
||||
group.addoption(
|
||||
"--maxprocesses",
|
||||
@@ -177,6 +181,10 @@ def pytest_configure(config):
|
||||
|
||||
@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)
|
||||
|
||||
if config.option.numprocesses:
|
||||
if config.option.dist == "no":
|
||||
config.option.dist = "load"
|
||||
@@ -188,11 +196,10 @@ def pytest_cmdline_main(config):
|
||||
config.option.dist = "load"
|
||||
val = config.getvalue
|
||||
if not val("collectonly"):
|
||||
usepdb = config.getoption("usepdb") # a core option
|
||||
if val("dist") != "no":
|
||||
if usepdb:
|
||||
raise pytest.UsageError(
|
||||
"--pdb is incompatible with distributing tests; try using -n0."
|
||||
"--pdb is incompatible with distributing tests; try using -n0 or -nauto."
|
||||
) # noqa: E501
|
||||
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import sys
|
||||
import os
|
||||
import time
|
||||
|
||||
import py
|
||||
import _pytest.hookspec
|
||||
import pytest
|
||||
from execnet.gateway_base import dumps, DumpError
|
||||
@@ -103,7 +104,9 @@ class WorkerInteractor(object):
|
||||
self.sendevent("logfinish", nodeid=nodeid, location=location)
|
||||
|
||||
def pytest_runtest_logreport(self, report):
|
||||
data = serialize_report(report)
|
||||
data = self.config.hook.pytest_report_to_serializable(
|
||||
config=self.config, report=report
|
||||
)
|
||||
data["item_index"] = self.item_index
|
||||
data["worker_id"] = self.workerid
|
||||
assert self.session.items[self.item_index].nodeid == report.nodeid
|
||||
@@ -112,7 +115,9 @@ class WorkerInteractor(object):
|
||||
def pytest_collectreport(self, report):
|
||||
# send only reports that have not passed to master as optimization (#330)
|
||||
if not report.passed:
|
||||
data = serialize_report(report)
|
||||
data = self.config.hook.pytest_report_to_serializable(
|
||||
config=self.config, report=report
|
||||
)
|
||||
self.sendevent("collectreport", data=data)
|
||||
|
||||
# the pytest_logwarning hook was deprecated since pytest 4.0
|
||||
@@ -142,47 +147,6 @@ class WorkerInteractor(object):
|
||||
)
|
||||
|
||||
|
||||
def serialize_report(rep):
|
||||
def disassembled_report(rep):
|
||||
reprtraceback = rep.longrepr.reprtraceback.__dict__.copy()
|
||||
reprcrash = rep.longrepr.reprcrash.__dict__.copy()
|
||||
|
||||
new_entries = []
|
||||
for entry in reprtraceback["reprentries"]:
|
||||
entry_data = {"type": type(entry).__name__, "data": entry.__dict__.copy()}
|
||||
for key, value in entry_data["data"].items():
|
||||
if hasattr(value, "__dict__"):
|
||||
entry_data["data"][key] = value.__dict__.copy()
|
||||
new_entries.append(entry_data)
|
||||
|
||||
reprtraceback["reprentries"] = new_entries
|
||||
|
||||
return {
|
||||
"reprcrash": reprcrash,
|
||||
"reprtraceback": reprtraceback,
|
||||
"sections": rep.longrepr.sections,
|
||||
}
|
||||
|
||||
import py
|
||||
|
||||
d = rep.__dict__.copy()
|
||||
if hasattr(rep.longrepr, "toterminal"):
|
||||
if hasattr(rep.longrepr, "reprtraceback") and hasattr(
|
||||
rep.longrepr, "reprcrash"
|
||||
):
|
||||
d["longrepr"] = disassembled_report(rep)
|
||||
else:
|
||||
d["longrepr"] = str(rep.longrepr)
|
||||
else:
|
||||
d["longrepr"] = rep.longrepr
|
||||
for name in d:
|
||||
if isinstance(d[name], py.path.local):
|
||||
d[name] = str(d[name])
|
||||
elif name == "result":
|
||||
d[name] = None # for now
|
||||
return d
|
||||
|
||||
|
||||
def serialize_warning_message(warning_message):
|
||||
if isinstance(warning_message.message, Warning):
|
||||
message_module = type(warning_message.message).__module__
|
||||
@@ -261,8 +225,6 @@ def remote_initconfig(option_dict, args):
|
||||
|
||||
|
||||
if __name__ == "__channelexec__":
|
||||
import py
|
||||
|
||||
channel = channel # noqa
|
||||
workerinput, args, option_dict, change_sys_path = channel.receive()
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ import fnmatch
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import threading
|
||||
|
||||
import py
|
||||
import pytest
|
||||
@@ -11,8 +10,6 @@ import execnet
|
||||
|
||||
import xdist.remote
|
||||
|
||||
from _pytest import runner # XXX load dynamically
|
||||
|
||||
|
||||
def parse_spec_config(config):
|
||||
xspeclist = []
|
||||
@@ -37,7 +34,6 @@ class NodeManager(object):
|
||||
|
||||
def __init__(self, config, specs=None, defaultchdir="pyexecnetcache"):
|
||||
self.config = config
|
||||
self._nodesready = threading.Event()
|
||||
self.trace = self.config.trace.get("nodemanager")
|
||||
self.group = execnet.Group()
|
||||
if specs is None:
|
||||
@@ -204,7 +200,13 @@ def make_reltoroot(roots, args):
|
||||
class WorkerController(object):
|
||||
ENDMARK = -1
|
||||
|
||||
class RemoteHook:
|
||||
@pytest.mark.trylast
|
||||
def pytest_xdist_getremotemodule(self):
|
||||
return xdist.remote
|
||||
|
||||
def __init__(self, nodemanager, gateway, config, putevent):
|
||||
config.pluginmanager.register(self.RemoteHook())
|
||||
self.nodemanager = nodemanager
|
||||
self.putevent = putevent
|
||||
self.gateway = gateway
|
||||
@@ -244,10 +246,13 @@ class WorkerController(object):
|
||||
basetemp = self.config._tmpdirhandler.getbasetemp()
|
||||
option_dict["basetemp"] = str(basetemp.join(name))
|
||||
self.config.hook.pytest_configure_node(node=self)
|
||||
self.channel = self.gateway.remote_exec(xdist.remote)
|
||||
|
||||
remote_module = self.config.hook.pytest_xdist_getremotemodule()
|
||||
self.channel = self.gateway.remote_exec(remote_module)
|
||||
# change sys.path only for remote workers
|
||||
change_sys_path = not self.gateway.spec.popen
|
||||
self.channel.send((self.workerinput, args, option_dict, change_sys_path))
|
||||
|
||||
if self.putevent:
|
||||
self.channel.setcallback(self.process_from_remote, endmarker=self.ENDMARK)
|
||||
|
||||
@@ -315,7 +320,9 @@ class WorkerController(object):
|
||||
self.notify_inproc(eventname, node=self, **kwargs)
|
||||
elif eventname in ("testreport", "collectreport", "teardownreport"):
|
||||
item_index = kwargs.pop("item_index", None)
|
||||
rep = unserialize_report(eventname, kwargs["data"])
|
||||
rep = self.config.hook.pytest_report_from_serializable(
|
||||
config=self.config, data=kwargs["data"]
|
||||
)
|
||||
if item_index is not None:
|
||||
rep.item_index = item_index
|
||||
self.notify_inproc(eventname, node=self, rep=rep)
|
||||
@@ -360,73 +367,6 @@ class WorkerController(object):
|
||||
self.notify_inproc("errordown", node=self, error=excinfo)
|
||||
|
||||
|
||||
def unserialize_report(name, reportdict):
|
||||
def assembled_report(reportdict):
|
||||
from _pytest._code.code import (
|
||||
ReprEntry,
|
||||
ReprEntryNative,
|
||||
ReprExceptionInfo,
|
||||
ReprFileLocation,
|
||||
ReprFuncArgs,
|
||||
ReprLocals,
|
||||
ReprTraceback,
|
||||
)
|
||||
|
||||
if reportdict["longrepr"]:
|
||||
if (
|
||||
"reprcrash" in reportdict["longrepr"]
|
||||
and "reprtraceback" in reportdict["longrepr"]
|
||||
):
|
||||
|
||||
reprtraceback = reportdict["longrepr"]["reprtraceback"]
|
||||
reprcrash = reportdict["longrepr"]["reprcrash"]
|
||||
|
||||
unserialized_entries = []
|
||||
reprentry = None
|
||||
for entry_data in reprtraceback["reprentries"]:
|
||||
data = entry_data["data"]
|
||||
entry_type = entry_data["type"]
|
||||
if entry_type == "ReprEntry":
|
||||
reprfuncargs = None
|
||||
reprfileloc = None
|
||||
reprlocals = None
|
||||
if data["reprfuncargs"]:
|
||||
reprfuncargs = ReprFuncArgs(**data["reprfuncargs"])
|
||||
if data["reprfileloc"]:
|
||||
reprfileloc = ReprFileLocation(**data["reprfileloc"])
|
||||
if data["reprlocals"]:
|
||||
reprlocals = ReprLocals(data["reprlocals"]["lines"])
|
||||
|
||||
reprentry = ReprEntry(
|
||||
lines=data["lines"],
|
||||
reprfuncargs=reprfuncargs,
|
||||
reprlocals=reprlocals,
|
||||
filelocrepr=reprfileloc,
|
||||
style=data["style"],
|
||||
)
|
||||
elif entry_type == "ReprEntryNative":
|
||||
reprentry = ReprEntryNative(data["lines"])
|
||||
else:
|
||||
report_unserialization_failure(entry_type, name, reportdict)
|
||||
unserialized_entries.append(reprentry)
|
||||
reprtraceback["reprentries"] = unserialized_entries
|
||||
|
||||
exception_info = ReprExceptionInfo(
|
||||
reprtraceback=ReprTraceback(**reprtraceback),
|
||||
reprcrash=ReprFileLocation(**reprcrash),
|
||||
)
|
||||
|
||||
for section in reportdict["longrepr"]["sections"]:
|
||||
exception_info.addsection(*section)
|
||||
reportdict["longrepr"] = exception_info
|
||||
return reportdict
|
||||
|
||||
if name == "testreport":
|
||||
return runner.TestReport(**assembled_report(reportdict))
|
||||
elif name == "collectreport":
|
||||
return runner.CollectReport(**assembled_report(reportdict))
|
||||
|
||||
|
||||
def unserialize_warning_message(data):
|
||||
import warnings
|
||||
import importlib
|
||||
@@ -467,17 +407,3 @@ def unserialize_warning_message(data):
|
||||
kwargs[attr_name] = data[attr_name]
|
||||
|
||||
return warnings.WarningMessage(**kwargs)
|
||||
|
||||
|
||||
def report_unserialization_failure(type_name, report_name, reportdict):
|
||||
from pprint import pprint
|
||||
|
||||
url = "https://github.com/pytest-dev/pytest-xdist/issues"
|
||||
stream = py.io.TextIO()
|
||||
pprint("-" * 100, stream=stream)
|
||||
pprint("INTERNALERROR: Unknown entry type returned: %s" % type_name, stream=stream)
|
||||
pprint("report_name: %s" % report_name, stream=stream)
|
||||
pprint(reportdict, stream=stream)
|
||||
pprint("Please report this bug at %s" % url, stream=stream)
|
||||
pprint("-" * 100, stream=stream)
|
||||
assert 0, stream.getvalue()
|
||||
|
||||
Reference in New Issue
Block a user