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

adapt to collection -> session renaming of pytest core

Browse Source
This commit is contained in:
holger krekel
2010-11-07 10:26:04 +01:00
parent 9d55d3c831
commit 8272a669a4
4 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xdist/looponfail.py
View File

@@ -143,30 +143,16 @@ class SlaveFailSession:
def pytest_collection(self, session):
self.session = session
self.collection = collection = session.collection
self.trails = self.current_command
hook = self.collection.ihook
hook = self.session.ihook
try:
items = collection.perform_collect(self.trails or None)
items = session.perform_collect(self.trails or None)
except pytest.UsageError:
items = collection.perform_collect(None)
hook.pytest_collection_modifyitems(config=session.config, items=items)
hook.pytest_collection_finish(collection=collection)
items = session.perform_collect(None)
hook.pytest_collection_modifyitems(session=session, config=session.config, items=items)
hook.pytest_collection_finish(session=session)
return True
if self.trails:
col = self.collection
items = []
for trail in self.trails:
names = col._parsearg(trail)
try:
for node in col.matchnodes([col._topcollector], names):
items.extend(col.genitems(node))
except pytest.UsageError:
pass # ignore collect errors / vanished tests
self.collection.items = items
return True
def pytest_runtest_logreport(self, report):
if report.failed:
self.recorded_failures.append(report)