Merge remote-tracking branch 'origin/features' into short-summary-message

Conflicts:
	src/_pytest/skipping.py

1 files changed, 0 insertions, 35 deletions

diff --git a/testing/test_skipping.py b/testing/test_skipping.py
index f0da0488c..4782e7065 100644
--- a/testing/test_skipping.py
+++ b/testing/test_skipping.py
@@ -7,7 +7,6 @@ import sys
 
 import pytest
 from _pytest.runner import runtestprotocol
-from _pytest.skipping import folded_skips
 from _pytest.skipping import MarkEvaluator
 from _pytest.skipping import pytest_runtest_setup
 
@@ -750,40 +749,6 @@ def test_skipif_class(testdir):
     result.stdout.fnmatch_lines(["*2 skipped*"])
 
 
-def test_skip_reasons_folding():
-    path = "xyz"
-    lineno = 3
-    message = "justso"
-    longrepr = (path, lineno, message)
-
-    class X(object):
-        pass
-
-    ev1 = X()
-    ev1.when = "execute"
-    ev1.skipped = True
-    ev1.longrepr = longrepr
-
-    ev2 = X()
-    ev2.when = "execute"
-    ev2.longrepr = longrepr
-    ev2.skipped = True
-
-    # ev3 might be a collection report
-    ev3 = X()
-    ev3.when = "collect"
-    ev3.longrepr = longrepr
-    ev3.skipped = True
-
-    values = folded_skips([ev1, ev2, ev3])
-    assert len(values) == 1
-    num, fspath, lineno, reason = values[0]
-    assert num == 3
-    assert fspath == path
-    assert lineno == lineno
-    assert reason == message
-
-
 def test_skipped_reasons_functional(testdir):
     testdir.makepyfile(
         test_one="""