floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_perform_collect: remove comment about untested code (#6144)

This commit is contained in:
Daniel Hahler 2019-11-07 13:18:08 +01:00 committed by GitHub
parent 14eaa05b60 dd852ded70
commit f11237b066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/main.py
View File

@ -476,7 +476,6 @@ class Session(nodes.FSCollector):
for arg, exc in self._notfound: for arg, exc in self._notfound:
line = "(no name {!r} in any of {!r})".format(arg, exc.args[0]) line = "(no name {!r} in any of {!r})".format(arg, exc.args[0])
errors.append("not found: {}\n{}".format(arg, line)) errors.append("not found: {}\n{}".format(arg, line))
# XXX: test this
raise UsageError(*errors) raise UsageError(*errors)
if not genitems: if not genitems:
return rep.result return rep.result

10
testing/acceptance_test.py
View File

@ -178,8 +178,14 @@ class TestGeneralUsage:
p1 = testdir.makepyfile("") p1 = testdir.makepyfile("")
p2 = testdir.makefile(".pyc", "123") p2 = testdir.makefile(".pyc", "123")
result = testdir.runpytest(p1, p2) result = testdir.runpytest(p1, p2)
assert result.ret assert result.ret == ExitCode.USAGE_ERROR
result.stderr.fnmatch_lines(["*ERROR: not found:*{}".format(p2.basename)]) result.stderr.fnmatch_lines(
[
"ERROR: not found: {}".format(p2),
"(no name {!r} in any of [[][]])".format(str(p2)),
"",
]
)
@pytest.mark.filterwarnings("default") @pytest.mark.filterwarnings("default")
def test_better_reporting_on_conftest_load_failure(self, testdir, request): def test_better_reporting_on_conftest_load_failure(self, testdir, request):