From 8bfe434f75296530a44c8bff7087a532703b4ca8 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 12 Dec 2019 16:44:07 -0300 Subject: [PATCH] Drop validation against multiple xmlfamilies This was not backported to 4.6 before, so had to adapt the test slightly to the old method of validation. --- testing/test_junitxml.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py index a08959c50..ba529cf33 100644 --- a/testing/test_junitxml.py +++ b/testing/test_junitxml.py @@ -1411,19 +1411,15 @@ def test_logging_passing_tests_disabled_does_not_log_test_output(testdir): assert len(node.find_by_tag("system-out")) == 0 -@parametrize_families @pytest.mark.parametrize("junit_logging", ["no", "system-out", "system-err"]) def test_logging_passing_tests_disabled_logs_output_for_failing_test_issue5430( - testdir, junit_logging, run_and_parse, xunit_family + testdir, junit_logging ): testdir.makeini( """ [pytest] junit_log_passing_tests=False - junit_family={family} - """.format( - family=xunit_family - ) + """ ) testdir.makepyfile( """ @@ -1436,9 +1432,7 @@ def test_logging_passing_tests_disabled_logs_output_for_failing_test_issue5430( assert 0 """ ) - result, dom = run_and_parse( - "-o", "junit_logging=%s" % junit_logging, family=xunit_family - ) + result, dom = runandparse(testdir, "-o", "junit_logging=%s" % junit_logging) assert result.ret == 1 node = dom.find_first_by_tag("testcase") if junit_logging == "system-out":