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

_perform_collect: remove comment about untested code 

Harden one test where it is tested.

All tests testing this:

    testing/acceptance_test.py:184(TestGeneralUsage::test_not_collectable_arguments)
    testing/acceptance_test.py:373(TestGeneralUsage::test_direct_addressing_notfound)
    testing/acceptance_test.py:403(TestGeneralUsage::test_issue134_report_error_when_collecting_member[test_fun.py::test_a])
    testing/acceptance_test.py:420(TestGeneralUsage::test_report_all_failed_collections_initargs)
    testing/test_config.py:1309(test_config_blocked_default_plugins[python])

(via https://github.com/blueyed/pytest/pull/88)
This commit is contained in:
Daniel Hahler 2019-11-06 19:51:58 +01:00
parent 5be3a9b5ce
commit dd852ded70
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):