jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3563 from asottile/undetermined_location_none 

Print <undetermined location> instead of None for warnings
This commit is contained in:
Bruno Oliveira 2018-06-10 16:19:50 -03:00 committed by GitHub
parent fe81de6150 49f621de76
commit 11705040ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/3563.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Warnings without ``location`` were reported as ``None``. This is corrected to now report ``<undetermined location>``.

2
src/_pytest/terminal.py
View File

@ -682,7 +682,7 @@ class TerminalReporter(object):
self.write_sep("=", "warnings summary", yellow=True, bold=False) self.write_sep("=", "warnings summary", yellow=True, bold=False)
for location, warning_records in grouped: for location, warning_records in grouped:
self._tw.line(str(location) or "<undetermined location>") self._tw.line(str(location) if location else "<undetermined location>")
for w in warning_records: for w in warning_records:
lines = w.message.splitlines() lines = w.message.splitlines()
indented = "\n".join(" " + x for x in lines) indented = "\n".join(" " + x for x in lines)

5
testing/test_terminal.py
View File

@ -1025,7 +1025,10 @@ def test_terminal_summary_warnings_are_displayed(testdir):
""" """
) )
result = testdir.runpytest("-rw") result = testdir.runpytest("-rw")
result.stdout.fnmatch_lines(["*internal warning", "*== 1 warnings in *"]) result.stdout.fnmatch_lines(
["<undetermined location>", "*internal warning", "*== 1 warnings in *"]
)
assert "None" not in result.stdout.str()
@pytest.mark.parametrize( @pytest.mark.parametrize(