Merge pull request #371 from nicoddemus/skip-module-370

Fix handling of skipped modules with pytest.skip at module level

Author: nicoddemus

changelog/332.bugfix.rst

@@ -0,0 +1 @@
+Fix report of module-level skips (``pytest.skip(reason, allow_module_level=True)``).

testing/test_remote.py

@@ -1,6 +1,8 @@
 import py
 import pprint
 import pytest
+from pkg_resources import parse_version
+
 from xdist.workermanage import WorkerController, unserialize_report
 from xdist.remote import serialize_report
 import execnet
@@ -293,24 +295,24 @@ def test_func():
         assert "workeroutput" in ev.kwargs
 
     @pytest.mark.skipif(
-        pytest.__version__ >= "3.0", reason="skip at module level illegal in pytest 3.0"
+        parse_version(pytest.__version__) < parse_version("3.3"),
+        reason="skip at module level illegal in this pytest version",
     )
     def test_remote_collect_skip(self, worker):
         worker.testdir.makepyfile(
             """
-            import py
-            py.test.skip("hello")
+            import pytest
+            pytest.skip("hello", allow_module_level=True)
         """
         )
         worker.setup()
         ev = worker.popevent("collectionstart")
         assert not ev.kwargs
         ev = worker.popevent()
         assert ev.name == "collectreport"
-        ev = worker.popevent()
-        assert ev.name == "collectreport"
         rep = unserialize_report(ev.name, ev.kwargs["data"])
         assert rep.skipped
+        assert rep.longrepr[2] == "Skipped: hello"
         ev = worker.popevent("collectionfinish")
         assert not ev.kwargs["ids"]
 

xdist/dsession.py

@@ -259,10 +259,10 @@ def worker_runtest_protocol_complete(self, node, item_index, duration):
     def worker_collectreport(self, node, rep):
         """Emitted when a node calls the pytest_collectreport hook.
 
-        Because we only need the report when there's a failure, as optimization
-        we only expect to receive failed reports from workers (#330).
+        Because we only need the report when there's a failure/skip, as optimization
+        we only expect to receive failed/skipped reports from workers (#330).
         """
-        assert rep.failed
+        assert not rep.passed
         self._failed_worker_collectreport(node, rep)
 
     def worker_logwarning(self, message, code, nodeid, fslocation):

xdist/remote.py

@@ -110,8 +110,8 @@ def pytest_runtest_logreport(self, report):
         self.sendevent("testreport", data=data)
 
     def pytest_collectreport(self, report):
-        # master only needs reports that failed, as optimization send only them instead (#330)
-        if report.failed:
+        # send only reports that have not passed to master as optimization (#330)
+        if not report.passed:
             data = serialize_report(report)
             self.sendevent("collectreport", data=data)