Skip to content

Commit d9b8f7c

Browse files
hroncoknicoddemus
authored andcommitted
Backport #8896
1 parent 69212d1 commit d9b8f7c

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

testing/python/metafunc.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,7 @@ def test_idmaker_enum(self) -> None:
448448
enum = pytest.importorskip("enum")
449449
e = enum.Enum("Foo", "one, two")
450450
result = idmaker(("a", "b"), [pytest.param(e.one, e.two)])
451-
if sys.version_info[:2] >= (3, 10):
452-
assert result == ["one-two"]
453-
else:
454-
assert result == ["Foo.one-Foo.two"]
451+
assert result == ["Foo.one-Foo.two"]
455452

456453
def test_idmaker_idfn(self) -> None:
457454
"""#351"""

testing/test_pytester.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -741,16 +741,10 @@ def test_run_result_repr() -> None:
741741

742742
# known exit code
743743
r = pytester.RunResult(1, outlines, errlines, duration=0.5)
744-
if sys.version_info[:2] >= (3, 10):
745-
assert repr(r) == (
746-
"<RunResult ret=TESTS_FAILED len(stdout.lines)=3"
747-
" len(stderr.lines)=4 duration=0.50s>"
748-
)
749-
else:
750-
assert repr(r) == (
751-
"<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
752-
" len(stderr.lines)=4 duration=0.50s>"
753-
)
744+
assert (
745+
repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
746+
" len(stderr.lines)=4 duration=0.50s>"
747+
)
754748

755749
# unknown exit code: just the number
756750
r = pytester.RunResult(99, outlines, errlines, duration=0.5)

0 commit comments

Comments
 (0)