From e9173707df498e7ac52b825c0d938c0b63cbb577 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sat, 28 Mar 2020 14:53:43 -0400 Subject: [PATCH] TST: update default junit_family pytest 6 will be moving to this by default and azure supports this format so might as well move to the future now. This causes exceptions from pytest if we try to set it in conftest.py with the markers --- lib/matplotlib/testing/conftest.py | 4 ++-- pytest.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py index e93787c809b7..563a9fc0fb66 100644 --- a/lib/matplotlib/testing/conftest.py +++ b/lib/matplotlib/testing/conftest.py @@ -7,8 +7,8 @@ def pytest_configure(config): # config is initialized here rather than in pytest.ini so that `pytest # --pyargs matplotlib` (which would not find pytest.ini) works. The only - # entries in pytest.ini set minversion (which is checked earlier) and - # testpaths/python_files, as they are required to properly find the tests. + # entries in pytest.ini set minversion (which is checked earlier), + # testpaths/python_files, as they are required to properly find the tests for key, value in [ ("markers", "flaky: (Provided by pytest-rerunfailures.)"), ("markers", "timeout: (Provided by pytest-timeout.)"), diff --git a/pytest.ini b/pytest.ini index e3fbd46ffff9..905d3a5e5a52 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,3 +4,4 @@ minversion = 3.6 testpaths = lib python_files = test_*.py +junit_family = xunit2