adapt to pytest-2.2.0.dev2

CHANGELOG

@@ -1,3 +1,8 @@
+1.7
+-------------------------
+
+- fix incompatibilities with pytest-2.2.0
+
 1.6
 -------------------------
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pytest-xdist",
-    version='1.6',
+    version='1.7.dev1',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=open('README.txt').read(),
     license='GPLv2 or later',
@@ -13,7 +13,7 @@ setup(
     packages = ['xdist'],
     entry_points = {'pytest11': ['xdist = xdist.plugin'],},
     zip_safe=False,
-    install_requires = ['execnet>=1.0.8', 'pytest>2.0.2'],
+    install_requires = ['execnet>=1.0.8', 'pytest>=2.2.0.dev2'],
     classifiers=[
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
@@ -27,4 +27,4 @@ setup(
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     ],
-)
+)

testing/test_boxed.py

@@ -16,13 +16,13 @@ def test_functional_boxed(testdir):
 class TestOptionEffects:
     def test_boxed_option_default(self, testdir):
         tmpdir = testdir.tmpdir.ensure("subdir", dir=1)
-        config = testdir.reparseconfig()
+        config = testdir.parseconfig()
         assert not config.option.boxed
         py.test.importorskip("execnet")
-        config = testdir.reparseconfig(['-d', tmpdir])
+        config = testdir.parseconfig('-d', tmpdir)
         assert not config.option.boxed
 
     def test_is_not_boxed_by_default(self, testdir):
-        config = testdir.reparseconfig([testdir.tmpdir])
+        config = testdir.parseconfig(testdir.tmpdir)
         assert not config.option.boxed
 

testing/test_remote.py

@@ -80,7 +80,7 @@ class TestReportSerialization:
                 py.test.xfail("hello")
         """)
         reports = reprec.getreports("pytest_runtest_logreport")
-        assert len(reports) == 6
+        assert len(reports) == 17 # with setup/teardown "passed" reports
         for rep in reports:
             d = serialize_report(rep)
             check_marshallable(d)
@@ -138,6 +138,7 @@ class TestSlaveInteractor:
         ids = ev.kwargs['ids']
         assert len(ids) == 1
         slave.sendcommand("runtests", ids=ids)
+        ev = slave.popevent("testreport") # setup
         ev = slave.popevent("testreport")
         assert ev.name == "testreport"
         rep = unserialize_report(ev.name, ev.kwargs['data'])
@@ -194,15 +195,12 @@ class TestSlaveInteractor:
         ids = ev.kwargs['ids']
         assert len(ids) == 2
         slave.sendcommand("runtests_all", )
-        ev = slave.popevent("testreport")
+        for func in "::test_func", "::test_func2":
-        assert ev.name == "testreport"
+            for i in range(3):  # setup/call/teardown
-        rep = unserialize_report(ev.name, ev.kwargs['data'])
+                ev = slave.popevent("testreport")
-        assert rep.nodeid.endswith("::test_func")
+                assert ev.name == "testreport"
-        ev = slave.popevent("testreport")
+                rep = unserialize_report(ev.name, ev.kwargs['data'])
-        assert ev.name == "testreport"
+                assert rep.nodeid.endswith(func)
-        rep = unserialize_report(ev.name, ev.kwargs['data'])
-        assert rep.nodeid.endswith("::test_func2")
-        assert rep.passed
         slave.sendcommand("shutdown")
         ev = slave.popevent("slavefinished")
         assert 'slaveoutput' in ev.kwargs

testing/test_slavemanage.py

@@ -135,7 +135,7 @@ class TestNodeManager:
     @py.test.mark.xfail
     def test_rsync_roots_no_roots(self, testdir, mysetup):
         mysetup.source.ensure("dir1", "file1").write("hello")
-        config = testdir.reparseconfig([source])
+        config = testdir.parseconfig(source)
         nodemanager = NodeManager(config, ["popen//chdir=%s" % mysetup.dest])
         #assert nodemanager.config.topdir == source == config.topdir
         nodemanager.makegateways()
@@ -179,7 +179,7 @@ class TestNodeManager:
             [pytest]
             rsyncdirs=dir1/dir2
         """))
-        config = testdir.reparseconfig([source])
+        config = testdir.parseconfig(source)
         nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
         nodemanager.makegateways()
         nodemanager.rsync_roots()
@@ -198,7 +198,7 @@ class TestNodeManager:
             rsyncdirs = dir1 dir5
             rsyncignore = dir1/dir2 dir5/dir6
         """))
-        config = testdir.reparseconfig([source])
+        config = testdir.parseconfig(source)
         nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
         nodemanager.makegateways()
         nodemanager.rsync_roots()
@@ -212,7 +212,7 @@ class TestNodeManager:
         specs = ["popen"] * 3
         source.join("conftest.py").write("rsyncdirs = ['a']")
         source.ensure('a', dir=1)
-        config = testdir.reparseconfig([source])
+        config = testdir.parseconfig(source)
         nodemanager = NodeManager(config, specs)
         nodemanager.makegateways()
         nodemanager.rsync_roots()

tox.ini

@@ -6,7 +6,7 @@ indexserver=
 
 [testenv]
 changedir=testing
-deps=:testrun:pytest
+deps=:testrun:pytest>=2.2.0.dev2
 commands= py.test --junitxml={envlogdir}/junit-{envname}.xml []
 
 [testenv:py31]

xdist/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '1.6'
+__version__ = '1.7.dev1'

xdist/dsession.py

@@ -271,7 +271,7 @@ class DSession:
                 self.terminal.write_line("")
                 self.terminal.write_line("scheduling tests via %s" %(
                     self.sched.__class__.__name__))
-                
+
             self.sched.init_distribute()
 
     def slave_logstart(self, node, nodeid, location):
@@ -279,8 +279,9 @@ class DSession:
             nodeid=nodeid, location=location)
 
     def slave_testreport(self, node, rep):
-        if rep.when in ("setup", "call"):
+        if not (rep.passed and rep.when != "call"):
-            self.sched.remove_item(node, rep.nodeid)
+            if rep.when in ("setup", "call"):
+                self.sched.remove_item(node, rep.nodeid)
         #self.report_line("testreport %s: %s" %(rep.id, rep.status))
         rep.node = node
         self.config.hook.pytest_runtest_logreport(report=rep)