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

Backport #8896

This commit is contained in:
Miro Hrončok 2021-07-12 16:32:27 +02:00 committed by Bruno Oliveira
parent 69212d15fa
commit d9b8f7cf0a
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/python/metafunc.py
View File

@ -448,10 +448,7 @@ class TestMetafunc:
enum = pytest.importorskip("enum") enum = pytest.importorskip("enum")
e = enum.Enum("Foo", "one, two") e = enum.Enum("Foo", "one, two")
result = idmaker(("a", "b"), [pytest.param(e.one, e.two)]) result = idmaker(("a", "b"), [pytest.param(e.one, e.two)])
if sys.version_info[:2] >= (3, 10): assert result == ["Foo.one-Foo.two"]
assert result == ["one-two"]
else:
assert result == ["Foo.one-Foo.two"]
def test_idmaker_idfn(self) -> None: def test_idmaker_idfn(self) -> None:
"""#351""" """#351"""

14
testing/test_pytester.py
View File

@ -741,16 +741,10 @@ def test_run_result_repr() -> None:
# known exit code # known exit code
r = pytester.RunResult(1, outlines, errlines, duration=0.5) r = pytester.RunResult(1, outlines, errlines, duration=0.5)
if sys.version_info[:2] >= (3, 10): assert (
assert repr(r) == ( repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
"<RunResult ret=TESTS_FAILED len(stdout.lines)=3" " len(stderr.lines)=4 duration=0.50s>"
" len(stderr.lines)=4 duration=0.50s>" )
)
else:
assert repr(r) == (
"<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
" len(stderr.lines)=4 duration=0.50s>"
)
# unknown exit code: just the number # unknown exit code: just the number
r = pytester.RunResult(99, outlines, errlines, duration=0.5) r = pytester.RunResult(99, outlines, errlines, duration=0.5)