Merge pull request #2409 from thaJeztah/update_pytest

Update pytest to v4.2.1, use xunit2 for Jenkins compatibility, and small config changes
2019-08-27 00:13:28 -07:00 · 2019-08-27 00:13:28 -07:00 · 9443decdf6
parent 70907325a5 9ea3da37a7
commit 9443decdf6
2 changed files with 4 additions and 1 deletions
--- a/pytest.ini
+++ b/pytest.ini
@ -1,2 +1,5 @@
 [pytest]
 addopts = --tb=short -rxs
+
+junit_suite_name = docker-py
+junit_family = xunit2
--- 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