fix for collection unification changes on pytest dev

setup.py

@@ -7,11 +7,10 @@ for the new options.
 """
 
 from setuptools import setup
-from xdist import __version__
 
 setup(
     name="pytest-xdist",
-    version=__version__,
+    version='1.5a2',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=__doc__,
     license='GPLv2 or later',

xdist/__init__.py

@@ -1,3 +1,2 @@
 #
-__version__ = "1.5a1"
-
+__version__ = '1.5a2'

xdist/looponfail.py

@@ -152,15 +152,16 @@ class SlaveFailSession:
         if self.topdir and self.trails:
             self.topdir = py.path.local(self.topdir)
             self.collection.topdir = self.topdir
-            nodes = []
+            col = self.collection
+            items = []
             for trail in self.trails:
-                names = self.collection._parsearg(trail, base=self.topdir)
+                names = col._parsearg(trail, base=self.topdir)
                 try:
-                    self.collection.genitems(
-                        [self.collection._topcollector], names, nodes)
+                    for node in col.matchnodes([col._topcollector], names):
+                        items.extend(col.genitems(node))
                 except self.config.Error:
                     pass # ignore collect errors / vanished tests
-            self.collection.items = nodes
+            self.collection.items = items
             return True
         self.topdir = session.collection.topdir