main: wrap_session: handle exit.Exception with notify_exception
Fixes https://github.com/pytest-dev/pytest/issues/6257. Via https://github.com/blueyed/pytest/pull/132.
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
import pytest
|
||||
from _pytest.main import ExitCode
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"ret_exc",
|
||||
(
|
||||
pytest.param((None, ValueError)),
|
||||
pytest.param((42, SystemExit)),
|
||||
pytest.param((False, SystemExit)),
|
||||
),
|
||||
)
|
||||
def test_wrap_session_notify_exception(ret_exc, testdir):
|
||||
returncode, exc = ret_exc
|
||||
c1 = testdir.makeconftest(
|
||||
"""
|
||||
import pytest
|
||||
|
||||
def pytest_sessionstart():
|
||||
raise {exc}("boom")
|
||||
|
||||
def pytest_internalerror(excrepr, excinfo):
|
||||
returncode = {returncode!r}
|
||||
if returncode is not False:
|
||||
pytest.exit("exiting after %s..." % excinfo.typename, returncode={returncode!r})
|
||||
""".format(
|
||||
returncode=returncode, exc=exc.__name__
|
||||
)
|
||||
)
|
||||
result = testdir.runpytest()
|
||||
if returncode:
|
||||
assert result.ret == returncode
|
||||
else:
|
||||
assert result.ret == ExitCode.INTERNAL_ERROR
|
||||
assert result.stdout.lines[0] == "INTERNALERROR> Traceback (most recent call last):"
|
||||
|
||||
if exc == SystemExit:
|
||||
assert result.stdout.lines[-3:] == [
|
||||
'INTERNALERROR> File "{}", line 4, in pytest_sessionstart'.format(c1),
|
||||
'INTERNALERROR> raise SystemExit("boom")',
|
||||
"INTERNALERROR> SystemExit: boom",
|
||||
]
|
||||
else:
|
||||
assert result.stdout.lines[-3:] == [
|
||||
'INTERNALERROR> File "{}", line 4, in pytest_sessionstart'.format(c1),
|
||||
'INTERNALERROR> raise ValueError("boom")',
|
||||
"INTERNALERROR> ValueError: boom",
|
||||
]
|
||||
if returncode is False:
|
||||
assert result.stderr.lines == ["mainloop: caught unexpected SystemExit!"]
|
||||
else:
|
||||
assert result.stderr.lines == ["Exit: exiting after {}...".format(exc.__name__)]
|
||||
Reference in New Issue
Block a user