Optimize collection performance

Only send failed collection reports, as master is only interested in failed
reports.

Fix #330
This commit is contained in:
Bruno Oliveira
2018-08-18 21:01:00 -03:00
parent 96af694bf3
commit 9bcd0e4352
4 changed files with 12 additions and 7 deletions

View File

@@ -0,0 +1 @@
Improve collection performance by reducing the number of events sent to ``master`` node.

View File

@@ -321,8 +321,6 @@ class TestWorkerInteractor:
assert not ev.kwargs assert not ev.kwargs
ev = worker.popevent() ev = worker.popevent()
assert ev.name == "collectreport" assert ev.name == "collectreport"
ev = worker.popevent()
assert ev.name == "collectreport"
rep = unserialize_report(ev.name, ev.kwargs["data"]) rep = unserialize_report(ev.name, ev.kwargs["data"])
assert rep.failed assert rep.failed
ev = worker.popevent("collectionfinish") ev = worker.popevent("collectionfinish")

View File

@@ -257,9 +257,13 @@ class DSession(object):
self.sched.mark_test_complete(node, item_index, duration) self.sched.mark_test_complete(node, item_index, duration)
def worker_collectreport(self, node, rep): def worker_collectreport(self, node, rep):
"""Emitted when a node calls the pytest_collectreport hook.""" """Emitted when a node calls the pytest_collectreport hook.
if rep.failed:
self._failed_worker_collectreport(node, rep) Because we only need the report when there's a failure, as optimization
we only expect to receive failed reports from workers (#330).
"""
assert rep.failed
self._failed_worker_collectreport(node, rep)
def worker_logwarning(self, message, code, nodeid, fslocation): def worker_logwarning(self, message, code, nodeid, fslocation):
"""Emitted when a node calls the pytest_logwarning hook.""" """Emitted when a node calls the pytest_logwarning hook."""

View File

@@ -109,8 +109,10 @@ class WorkerInteractor(object):
self.sendevent("testreport", data=data) self.sendevent("testreport", data=data)
def pytest_collectreport(self, report): def pytest_collectreport(self, report):
data = serialize_report(report) # master only needs reports that failed, as optimization send only them instead (#330)
self.sendevent("collectreport", data=data) if report.failed:
data = serialize_report(report)
self.sendevent("collectreport", data=data)
def pytest_logwarning(self, message, code, nodeid, fslocation): def pytest_logwarning(self, message, code, nodeid, fslocation):
self.sendevent( self.sendevent(