IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update collected tests from slaves into main pytest session object

Browse Source 
Upstream changes in https://github.com/pytest-dev/pytest/pull/817 make
pytest-dist always return EXIT_NOTESTSCOLLECTED because the
master node doesn't collect any tests. This patch updates the pytest session
about the collected items on the slaves.
This commit is contained in:
Bruno Oliveira
2015-07-04 15:40:55 -03:00
parent 54a43db053
commit 05ab96feaf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xdist/dsession.py
View File

@@ -455,6 +455,7 @@ class DSession:
self.countfailures = 0 self.countfailures = 0
self.maxfail = config.getvalue("maxfail") self.maxfail = config.getvalue("maxfail")
self.queue = queue.Queue() self.queue = queue.Queue()
self._session = None
self._failed_collection_errors = {} self._failed_collection_errors = {}
self._active_nodes = set() self._active_nodes = set()
try: try:
@@ -488,12 +489,14 @@ class DSession:
self.nodemanager = NodeManager(self.config) self.nodemanager = NodeManager(self.config)
nodes = self.nodemanager.setup_nodes(putevent=self.queue.put) nodes = self.nodemanager.setup_nodes(putevent=self.queue.put)
self._active_nodes.update(nodes) self._active_nodes.update(nodes)
self._session = session
def pytest_sessionfinish(self, session): def pytest_sessionfinish(self, session):
"""Shutdown all nodes.""" """Shutdown all nodes."""
nm = getattr(self, 'nodemanager', None) # if not fully initialized nm = getattr(self, 'nodemanager', None) # if not fully initialized
if nm is not None: if nm is not None:
nm.teardown_nodes() nm.teardown_nodes()
self._session = None
def pytest_collection(self): def pytest_collection(self):
# prohibit collection of test items in master process # prohibit collection of test items in master process
@@ -595,6 +598,9 @@ class DSession:
""" """
if self.shuttingdown: if self.shuttingdown:
return return
# tell session which items were effectively collected otherwise
# the master node will exit with EXIT_NOTESTSCOLLECTED
self._session._testscollected = len(ids)
self.sched.addnode_collection(node, ids) self.sched.addnode_collection(node, ids)
if self.terminal: if self.terminal:
self.trdist.setstatus(node.gateway.spec, "[%d]" % (len(ids))) self.trdist.setstatus(node.gateway.spec, "[%d]" % (len(ids)))