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

tests: remove unnecessary test, clarify 

Follow-up to https://github.com/pytest-dev/pytest/pull/6009.
This commit is contained in:
Daniel Hahler 2019-10-20 20:39:56 +02:00
parent 16efa1bfef
commit 0123b29ed7
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
testing/python/setup_only.py
View File

@ -1,4 +1,5 @@
import pytest import pytest
from _pytest.main import ExitCode
@pytest.fixture(params=["--setup-only", "--setup-plan", "--setup-show"], scope="module") @pytest.fixture(params=["--setup-only", "--setup-plan", "--setup-show"], scope="module")
@ -270,19 +271,17 @@ def test_show_fixtures_and_execute_test(testdir):
def test_setup_show_with_KeyboardInterrupt_in_test(testdir): def test_setup_show_with_KeyboardInterrupt_in_test(testdir):
""" Verifies that setups are shown and tests are executed even if there was a KeyboardInterrupt in a test. """
p = testdir.makepyfile( p = testdir.makepyfile(
""" """
import pytest import pytest
@pytest.fixture @pytest.fixture
def arg(): def arg():
assert True pass
def test_arg(arg): def test_arg(arg):
raise KeyboardInterrupt() raise KeyboardInterrupt()
""" """
) )
result = testdir.runpytest("--setup-show", p, no_reraise_ctrlc=True) result = testdir.runpytest("--setup-show", p, no_reraise_ctrlc=True)
assert result.ret == 2
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
[ [
"*SETUP F arg*", "*SETUP F arg*",
@ -292,22 +291,4 @@ def test_setup_show_with_KeyboardInterrupt_in_test(testdir):
"*= no tests ran in *", "*= no tests ran in *",
] ]
) )
assert result.ret == ExitCode.INTERRUPTED
def test_setup_show_with_KeyboardInterrupt_in_fixture(testdir):
""" Verifies that setups are shown and tests are executed even if there was a KeyboardInterrupt in a fixture. """
p = testdir.makepyfile(
"""
import pytest
@pytest.fixture
def arg():
raise KeyboardInterrupt()
def test_arg(arg):
assert True
"""
)
result = testdir.runpytest("--setup-show", p, no_reraise_ctrlc=True)
assert result.ret == 2
result.stdout.fnmatch_lines(
["*SETUP F arg*", "*! KeyboardInterrupt !*", "*= no tests ran in *"]
)