adapt to pytest changes, add looponfailingdirs ini-option

This commit is contained in:
holger krekel
2010-11-06 09:58:00 +01:00
parent 985c9163b7
commit 9d55d3c831
9 changed files with 48 additions and 37 deletions

View File

@@ -53,8 +53,8 @@ class SlaveInteractor:
if name == "runtests":
ids = kwargs['ids']
for nodeid in ids:
for item in self.collection.getbyid(nodeid):
self.config.hook.pytest_runtest_protocol(item=item)
item = self._id2item[nodeid]
self.config.hook.pytest_runtest_protocol(item=item)
elif name == "runtests_all":
for item in self.collection.items:
self.config.hook.pytest_runtest_protocol(item=item)
@@ -63,9 +63,13 @@ class SlaveInteractor:
return True
def pytest_collection_finish(self, collection):
ids = [collection.getid(item) for item in collection.items]
self._id2item = {}
ids = []
for item in collection.items:
self._id2item[item.nodeid] = item
ids.append(item.nodeid)
self.sendevent("collectionfinish",
topdir=str(collection.topdir),
topdir=str(collection.fspath),
ids=ids)
#def pytest_runtest_logstart(self, nodeid, location, fspath):