diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2019-12-16 21:57:26 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-16 21:57:26 -0300 |
| commit | 75493f78bfdb68df5ea54d1375b65d70b890fbde (patch) | |
| tree | 579ba738ebb7527b95be585779fef22e96b91248 /src/_pytest/deprecated.py | |
| parent | c487cf9dd575a9b5e1fbc25cbc5b10f612b13f91 (diff) | |
| parent | 853889e5db288972040c78b1086517fb0425e25c (diff) | |
| download | pytest-75493f78bfdb68df5ea54d1375b65d70b890fbde.tar.gz | |
Merge master into features (#6346)
Merge master into features
Diffstat (limited to 'src/_pytest/deprecated.py')
| -rw-r--r-- | src/_pytest/deprecated.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py index afaa0e72a..db43c6ca3 100644 --- a/src/_pytest/deprecated.py +++ b/src/_pytest/deprecated.py @@ -41,7 +41,8 @@ NODE_USE_FROM_PARENT = UnformattedWarning( JUNIT_XML_DEFAULT_FAMILY = PytestDeprecationWarning( "The 'junit_family' default value will change to 'xunit2' in pytest 6.0.\n" - "Add 'junit_family=legacy' to your pytest.ini file to silence this warning and make your suite compatible." + "Add 'junit_family=xunit1' to your pytest.ini file to keep the current format " + "in future versions of pytest and silence this warning." ) NO_PRINT_LOGS = PytestDeprecationWarning( |