From 6ecbd008c417795a8a11563428d1706c4b4230f2 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 17 Aug 2020 17:39:13 -0300
Subject: Change junit_family default to xunit2

---
 testing/deprecated_test.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'testing')

diff --git a/testing/deprecated_test.py b/testing/deprecated_test.py
index aab7b7b36..fb591d7d9 100644
--- a/testing/deprecated_test.py
+++ b/testing/deprecated_test.py
@@ -75,35 +75,6 @@ def test_external_plugins_integrated(testdir, plugin):
         testdir.parseconfig("-p", plugin)
 
 
-@pytest.mark.parametrize("junit_family", [None, "legacy", "xunit2"])
-def test_warn_about_imminent_junit_family_default_change(testdir, junit_family):
-    """Show a warning if junit_family is not defined and --junitxml is used (#6179)"""
-    testdir.makepyfile(
-        """
-        def test_foo():
-            pass
-    """
-    )
-    if junit_family:
-        testdir.makeini(
-            """
-            [pytest]
-            junit_family={junit_family}
-        """.format(
-                junit_family=junit_family
-            )
-        )
-
-    result = testdir.runpytest("--junit-xml=foo.xml")
-    warning_msg = (
-        "*PytestDeprecationWarning: The 'junit_family' default value will change*"
-    )
-    if junit_family:
-        result.stdout.no_fnmatch_line(warning_msg)
-    else:
-        result.stdout.fnmatch_lines([warning_msg])
-
-
 @pytest.mark.skip(reason="should be reintroduced in 6.1: #7361")
 def test_fillfuncargs_is_deprecated() -> None:
     with pytest.warns(
-- 
cgit v1.2.3