p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4159 from thisch/subclassedfile 

Increase required verbosity level for debug output
This commit is contained in:
Bruno Oliveira 2018-10-16 10:41:27 -03:00 committed by GitHub
parent e4e4fd1e52 e8c220b9bd
commit 54b8ad4554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/4159.feature.rst Normal file
View File

@ -0,0 +1,3 @@
For test-suites containing test classes, the information about the subclassed
module is now output only if a higher verbosity level is specified (at least
"-vv").

4
src/_pytest/terminal.py
View File

@ -676,7 +676,9 @@ class TerminalReporter(object):
if fspath: if fspath:
res = mkrel(nodeid).replace("::()", "") # parens-normalization res = mkrel(nodeid).replace("::()", "") # parens-normalization
if nodeid.split("::")[0] != fspath.replace("\\", nodes.SEP): if self.verbosity >= 2 and nodeid.split("::")[0] != fspath.replace(
"\\", nodes.SEP
):
res += " <- " + self.startdir.bestrelpath(fspath) res += " <- " + self.startdir.bestrelpath(fspath)
else: else:
res = "[location]" res = "[location]"

4
testing/acceptance_test.py
View File

@ -750,8 +750,8 @@ class TestInvocationVariants(object):
if hasattr(py.path.local, "mksymlinkto"): if hasattr(py.path.local, "mksymlinkto"):
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
[ [
"lib/foo/bar/test_bar.py::test_bar <- local/lib/foo/bar/test_bar.py PASSED*", "lib/foo/bar/test_bar.py::test_bar PASSED*",
"lib/foo/bar/test_bar.py::test_other <- local/lib/foo/bar/test_bar.py PASSED*", "lib/foo/bar/test_bar.py::test_other PASSED*",
"*2 passed*", "*2 passed*",
] ]
) )

4
testing/test_terminal.py
View File

@ -154,7 +154,7 @@ class TestTerminal(object):
) )
result = testdir.runpytest(p2) result = testdir.runpytest(p2)
result.stdout.fnmatch_lines(["*test_p2.py .*", "*1 passed*"]) result.stdout.fnmatch_lines(["*test_p2.py .*", "*1 passed*"])
result = testdir.runpytest("-v", p2) result = testdir.runpytest("-vv", p2)
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
["*test_p2.py::TestMore::test_p1* <- *test_p1.py*PASSED*"] ["*test_p2.py::TestMore::test_p1* <- *test_p1.py*PASSED*"]
) )
@ -170,7 +170,7 @@ class TestTerminal(object):
""" """
) )
) )
result = testdir.runpytest("-v") result = testdir.runpytest("-vv")
assert result.ret == 0 assert result.ret == 0
result.stdout.fnmatch_lines(["*a123/test_hello123.py*PASS*"]) result.stdout.fnmatch_lines(["*a123/test_hello123.py*PASS*"])
assert " <- " not in result.stdout.str() assert " <- " not in result.stdout.str()