Skip to content

Commit 94e4a2d

Browse files
author
aostr
committed
* implemented changes recommended by nicoddemus
1 parent b4e0fab commit 94e4a2d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
Thanks `@bagerard`_ for reporting (`#1503`_). Thanks to `@davehunt`_ and
3737
`@tomviner`_ for PR.
3838

39-
* Whitelisted pytest warnings to show up warnings summary by default. Added a new
40-
flag ``--disable-pytest-warnings`` to explicitly disable the warnings summary.
39+
* Now pytest warnings summary is shown up by default. Added a new flag
40+
``--disable-pytest-warnings`` to explicitly disable the warnings summary.
4141
This change resolves the (`#1668`_).
4242

4343
* Renamed the pytest ``pdb`` module (plugin) into ``debugging``.

_pytest/terminal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def pytest_addoption(parser):
2222
group._addoption('-r',
2323
action="store", dest="reportchars", default='', metavar="chars",
2424
help="show extra test summary info as specified by chars (f)ailed, "
25-
"(E)error, (s)skipped, (x)failed, (X)passed (w)pytest-warnings "
25+
"(E)error, (s)skipped, (x)failed, (X)passed, "
2626
"(p)passed, (P)passed with output, (a)all except pP. "
2727
"The pytest warnings are displayed at all times except when "
2828
"--disable-pytest-warnings is set")

testing/test_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,11 +517,11 @@ def fix(request):
517517
def test_hello(fix):
518518
pass
519519
""")
520-
result = testdir.runpytest()
520+
result = testdir.runpytest("--disable-pytest-warnings")
521521
assert result.parseoutcomes()["pytest-warnings"] > 0
522-
assert "hello" in result.stdout.str()
522+
assert "hello" not in result.stdout.str()
523523

524-
result = testdir.runpytest("-rw")
524+
result = testdir.runpytest()
525525
result.stdout.fnmatch_lines("""
526526
===*pytest-warning summary*===
527527
*WT1*test_warn_on_test_item*:5*hello*

0 commit comments

Comments
 (0)