fix and unify remote skip test/collect reports

testing/acceptance_test.py

@@ -144,7 +144,7 @@ class TestDistribution:
         subdir.ensure("__init__.py")
         p = subdir.join("test_one.py")
         p.write("def test_5():\n  assert not __file__.startswith(%r)" % str(p))
-        result = testdir.runpytest("-v", "-d", 
+        result = testdir.runpytest("-v", "-d",
             "--rsyncdir=%(subdir)s" % locals(),
             "--tx=popen//chdir=%(dest)s" % locals(), p)
         assert result.ret == 0
@@ -394,3 +394,18 @@ def test_crashing_item(testdir):
 
 
 
+def test_skipping(testdir):
+    p = testdir.makepyfile("""
+        import pytest
+        def test_crash():
+            pytest.skip("hello")
+    """)
+    result = testdir.runpytest("-n1", '-rs', p)
+    assert result.ret == 0
+    result.stdout.fnmatch_lines([
+        "*hello*",
+        "*1 skipped*"
+    ])
+
+
+

testing/test_remote.py

@@ -88,8 +88,8 @@ class TestReportSerialization:
             assert newrep.passed == rep.passed
             assert newrep.failed == rep.failed
             assert newrep.skipped == rep.skipped
-            if newrep.skipped:
-                assert len(newrep.reprcrash) == 3
+            if newrep.skipped and 'xfail' not in newrep.keywords:
+                assert len(newrep.longrepr) == 3
             assert newrep.outcome == rep.outcome
             assert newrep.when == rep.when
             assert newrep.keywords == rep.keywords