Merge pull request #5653 from blueyed/fix-test

Followup: unittest: handle outcomes.Exit
This commit is contained in:
Bruno Oliveira 2019-07-23 15:09:24 -03:00 committed by GitHub
commit 880e368607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1 +1,2 @@
``pytest.exit`` and ``bdb.BdbQuit`` are now correctly handled in ``unittest`` cases.
``pytest.exit`` is now correctly handled in ``unittest`` cases.
This makes ``unittest`` cases handle ``quit`` from pytest's pdb correctly.

View File

@ -1085,4 +1085,4 @@ def test_exit_outcome(testdir):
"""
)
result = testdir.runpytest()
result.stdout.fnmatch_lines("*Exit: pytest_exit called*")
result.stdout.fnmatch_lines(["*Exit: pytest_exit called*", "*= no tests ran in *"])