From 0b03a99b457c5c1224c03300b1e242cb7d2238ff Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 10 Aug 2019 19:04:54 +0200 Subject: [PATCH] pytest: update to v4.2.1 - use xunit2 for compatibility with Jenkins - pytest-dev/pytest#3547: `--junitxml` can emit XML compatible with Jenkins xUnit. `junit_family` INI option accepts `legacy|xunit1`, which produces old style output, and `xunit2` that conforms more strictly to https://github.com/jenkinsci/xunit-plugin/blob/xunit-2.3.2/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd Signed-off-by: Sebastiaan van Stijn --- pytest.ini | 1 + test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index 6d1fa045fd..2d4efca2a7 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,3 +3,4 @@ addopts = --tb=short -rxs junit_suite_name = docker-py junit_logging = no +junit_family = xunit2 diff --git a/test-requirements.txt b/test-requirements.txt index b89f64622d..bebfee8618 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ coverage==4.5.2 flake8==3.6.0 mock==1.0.1 -pytest==4.1.0 +pytest==4.2.1 pytest-cov==2.6.1 pytest-timeout==1.3.3