Skip to content

Commit 1e6b495

Browse files
committed
Adjust enum reprs for Python 3.10
Potential fix for pytest-dev#8546
1 parent bfcd796 commit 1e6b495

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

testing/python/metafunc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,10 @@ 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-
assert result == ["Foo.one-Foo.two"]
451+
assert result in [
452+
["Foo.one-Foo.two"],
453+
["one-two"], # Python 3.10
454+
]
452455

453456
def test_idmaker_idfn(self) -> None:
454457
"""#351"""

testing/test_pytester.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,14 @@ def test_run_result_repr() -> None:
744744

745745
# known exit code
746746
r = pytester_mod.RunResult(1, outlines, errlines, duration=0.5)
747-
assert (
748-
repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
749-
" len(stderr.lines)=4 duration=0.50s>"
750-
)
747+
expected = [
748+
"<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
749+
" len(stderr.lines)=4 duration=0.50s>",
750+
# Python 3.10
751+
"<RunResult ret=TESTS_FAILED len(stdout.lines)=3"
752+
" len(stderr.lines)=4 duration=0.50s>",
753+
]
754+
assert repr(r) in expected
751755

752756
# unknown exit code: just the number
753757
r = pytester_mod.RunResult(99, outlines, errlines, duration=0.5)

0 commit comments

Comments
 (0)