From 8272a669a49ff46f5d408573db688c32fb79fce8 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 7 Nov 2010 10:26:04 +0100
Subject: [PATCH] adapt to collection -> session renaming of pytest core

---
 setup.py            |  2 +-
 xdist/__init__.py   |  2 +-
 xdist/looponfail.py | 24 +++++-------------------
 xdist/remote.py     |  9 ++++-----
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/setup.py b/setup.py
index 9ec62dc..5d8a354 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from setuptools import setup
 
 setup(
     name="pytest-xdist",
-    version='1.5a5',
+    version='1.5a6',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=__doc__,
     license='GPLv2 or later',
diff --git a/xdist/__init__.py b/xdist/__init__.py
index f21da87..4a20076 100644
--- a/xdist/__init__.py
+++ b/xdist/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '1.5a5'
\ No newline at end of file
+__version__ = '1.5a6'
\ No newline at end of file
diff --git a/xdist/looponfail.py b/xdist/looponfail.py
index ec4e34b..ed574de 100644
--- a/xdist/looponfail.py
+++ b/xdist/looponfail.py
@@ -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)
diff --git a/xdist/remote.py b/xdist/remote.py
index c19be64..b28940f 100644
--- a/xdist/remote.py
+++ b/xdist/remote.py
@@ -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):