Skip to content

Commit

Permalink
TST: update default junit_family
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tacaswell committed Mar 28, 2020
1 parent c292827 commit e917370
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/matplotlib/testing/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.)"),
Expand Down
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ minversion = 3.6

testpaths = lib
python_files = test_*.py
junit_family = xunit2

0 comments on commit e917370

Please sign in to comment.