adapt to collection -> session renaming of pytest core

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

View File

@@ -32,7 +32,6 @@ class SlaveInteractor:
def pytest_sessionstart(self, session):
self.session = session
self.collection = session.collection
slaveinfo = getinfodict()
self.sendevent("slaveready", slaveinfo=slaveinfo)
@@ -56,20 +55,20 @@ class SlaveInteractor:
item = self._id2item[nodeid]
self.config.hook.pytest_runtest_protocol(item=item)
elif name == "runtests_all":
for item in self.collection.items:
for item in session.items:
self.config.hook.pytest_runtest_protocol(item=item)
elif name == "shutdown":
break
return True
def pytest_collection_finish(self, collection):
def pytest_collection_finish(self, session):
self._id2item = {}
ids = []
for item in collection.items:
for item in session.items:
self._id2item[item.nodeid] = item
ids.append(item.nodeid)
self.sendevent("collectionfinish",
topdir=str(collection.fspath),
topdir=str(session.fspath),
ids=ids)
#def pytest_runtest_logstart(self, nodeid, location, fspath):