Skip to content

testing: clean up parametrization in test_mark.py #7184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 7, 2020
Merged

testing: clean up parametrization in test_mark.py #7184

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7f45a3
testing: clean up parametrization in test_mark.py
bluetech May 7, 2020
39f339c
Does the reverse also fail?
bluetech May 7, 2020
95c7774
Run again
bluetech May 7, 2020
a77277e
And again
bluetech May 7, 2020
0a2a7f9
Final time
bluetech May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 40 additions & 45 deletions testing/test_mark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,17 @@ def test_hello():


@pytest.mark.parametrize(
"spec",
("expr", "expected_passed"),
[
("xyz", ("test_one",)),
("((( xyz)) )", ("test_one",)),
("not not xyz", ("test_one",)),
("xyz and xyz2", ()),
("xyz2", ("test_two",)),
("xyz or xyz2", ("test_one", "test_two")),
("xyz", ["test_one"]),
("((( xyz)) )", ["test_one"]),
("not not xyz", ["test_one"]),
("xyz and xyz2", []),
("xyz2", ["test_two"]),
("xyz or xyz2", ["test_one", "test_two"]),
],
)
def test_mark_option(spec, testdir):
def test_mark_option(expr: str, expected_passed: str, testdir) -> None:
testdir.makepyfile(
"""
import pytest
Expand All @@ -219,18 +219,17 @@ def test_two():
pass
"""
)
opt, passed_result = spec
rec = testdir.inline_run("-m", opt)
rec = testdir.inline_run("-m", expr)
passed, skipped, fail = rec.listoutcomes()
passed = [x.nodeid.split("::")[-1] for x in passed]
assert len(passed) == len(passed_result)
assert list(passed) == list(passed_result)
assert passed == expected_passed


@pytest.mark.parametrize(
"spec", [("interface", ("test_interface",)), ("not interface", ("test_nointer",))]
("expr", "expected_passed"),
[("interface", ["test_interface"]), ("not interface", ["test_nointer"])],
)
def test_mark_option_custom(spec, testdir):
def test_mark_option_custom(expr: str, expected_passed: str, testdir) -> None:
testdir.makeconftest(
"""
import pytest
Expand All @@ -248,26 +247,25 @@ def test_nointer():
pass
"""
)
opt, passed_result = spec
rec = testdir.inline_run("-m", opt)
rec = testdir.inline_run("-m", expr)
passed, skipped, fail = rec.listoutcomes()
passed = [x.nodeid.split("::")[-1] for x in passed]
assert len(passed) == len(passed_result)
assert list(passed) == list(passed_result)
assert passed == expected_passed


@pytest.mark.parametrize(
"spec",
("expr", "expected_passed"),
[
("interface", ("test_interface",)),
("not interface", ("test_nointer", "test_pass", "test_1", "test_2")),
("pass", ("test_pass",)),
("not pass", ("test_interface", "test_nointer", "test_1", "test_2")),
("not not not (pass)", ("test_interface", "test_nointer", "test_1", "test_2")),
("1 or 2", ("test_1", "test_2")),
("interface", ["test_interface"]),
("not interface", ["test_nointer", "test_pass", "test_1", "test_2"]),
("pass", ["test_pass"]),
("not pass", ["test_interface", "test_nointer", "test_1", "test_2"]),
("not not not (pass)", ["test_interface", "test_nointer", "test_1", "test_2"]),
("1 or 2", ["test_1", "test_2"]),
("not (1 or 2)", ["test_interface", "test_nointer", "test_pass"]),
],
)
def test_keyword_option_custom(spec, testdir):
def test_keyword_option_custom(expr: str, expected_passed: str, testdir) -> None:
testdir.makepyfile(
"""
def test_interface():
Expand All @@ -282,12 +280,10 @@ def test_2():
pass
"""
)
opt, passed_result = spec
rec = testdir.inline_run("-k", opt)
rec = testdir.inline_run("-k", expr)
passed, skipped, fail = rec.listoutcomes()
passed = [x.nodeid.split("::")[-1] for x in passed]
assert len(passed) == len(passed_result)
assert list(passed) == list(passed_result)
assert passed == expected_passed


def test_keyword_option_considers_mark(testdir):
Expand All @@ -298,14 +294,14 @@ def test_keyword_option_considers_mark(testdir):


@pytest.mark.parametrize(
"spec",
("expr", "expected_passed"),
[
("None", ("test_func[None]",)),
("[1.3]", ("test_func[1.3]",)),
("2-3", ("test_func[2-3]",)),
("None", ["test_func[None]"]),
("[1.3]", ["test_func[1.3]"]),
("2-3", ["test_func[2-3]"]),
],
)
def test_keyword_option_parametrize(spec, testdir):
def test_keyword_option_parametrize(expr: str, expected_passed: str, testdir) -> None:
testdir.makepyfile(
"""
import pytest
Expand All @@ -314,12 +310,10 @@ def test_func(arg):
pass
"""
)
opt, passed_result = spec
rec = testdir.inline_run("-k", opt)
rec = testdir.inline_run("-k", expr)
passed, skipped, fail = rec.listoutcomes()
passed = [x.nodeid.split("::")[-1] for x in passed]
assert len(passed) == len(passed_result)
assert list(passed) == list(passed_result)
assert passed == expected_passed


def test_parametrize_with_module(testdir):
Expand All @@ -338,7 +332,7 @@ def test_func(arg):


@pytest.mark.parametrize(
"spec",
("expr", "expected_error"),
[
(
"foo or",
Expand All @@ -360,17 +354,18 @@ def test_func(arg):
),
],
)
def test_keyword_option_wrong_arguments(spec, testdir, capsys):
def test_keyword_option_wrong_arguments(
expr: str, expected_error: str, testdir, capsys
) -> None:
testdir.makepyfile(
"""
def test_func(arg):
pass
"""
)
opt, expected_result = spec
testdir.inline_run("-k", opt)
out = capsys.readouterr().err
assert expected_result in out
testdir.inline_run("-k", expr)
err = capsys.readouterr().err
assert expected_error in err


def test_parametrized_collected_from_command_line(testdir):
Expand Down