diff --git a/tests/test_inspect.py b/tests/test_inspect.py index 130e8df129..28c1b100b0 100644 --- a/tests/test_inspect.py +++ b/tests/test_inspect.py @@ -33,14 +33,9 @@ reason="rendered differently on py3.11", ) -skip_py312 = pytest.mark.skipif( - sys.version_info.minor == 12 and sys.version_info.major == 3, - reason="rendered differently on py3.12", -) - -skip_py313 = pytest.mark.skipif( - sys.version_info.minor == 13 and sys.version_info.major == 3, - reason="rendered differently on py3.13", +skip_py312_or_later = pytest.mark.skipif( + sys.version_info.minor >= 12 and sys.version_info.major == 3, + reason="rendered differently on py3.12 and later versions", ) skip_pypy3 = pytest.mark.skipif( @@ -139,8 +134,7 @@ def test_inspect_empty_dict(): assert render({}).startswith(expected) -@skip_py313 -@skip_py312 +@skip_py312_or_later @skip_py311 @skip_pypy3 def test_inspect_builtin_function_except_python311(): @@ -217,8 +211,7 @@ def test_inspect_integer_with_value(): @skip_py310 @skip_py311 -@skip_py312 -@skip_py313 +@skip_py312_or_later def test_inspect_integer_with_methods_python38_and_python39(): expected = ( "╭──────────────── ─────────────────╮\n" @@ -255,8 +248,7 @@ def test_inspect_integer_with_methods_python38_and_python39(): @skip_py38 @skip_py39 @skip_py311 -@skip_py312 -@skip_py313 +@skip_py312_or_later def test_inspect_integer_with_methods_python310only(): expected = ( "╭──────────────── ─────────────────╮\n" @@ -297,8 +289,7 @@ def test_inspect_integer_with_methods_python310only(): @skip_py38 @skip_py39 @skip_py310 -@skip_py312 -@skip_py313 +@skip_py312_or_later def test_inspect_integer_with_methods_python311(): # to_bytes and from_bytes methods on int had minor signature change - # they now, as of 3.11, have default values for all of their parameters diff --git a/tests/test_pretty.py b/tests/test_pretty.py index 90be42f873..7c1187dcf8 100644 --- a/tests/test_pretty.py +++ b/tests/test_pretty.py @@ -22,21 +22,9 @@ sys.version_info.minor == 9 and sys.version_info.major == 3, reason="rendered differently on py3.9", ) -skip_py310 = pytest.mark.skipif( - sys.version_info.minor == 10 and sys.version_info.major == 3, - reason="rendered differently on py3.10", -) -skip_py311 = pytest.mark.skipif( - sys.version_info.minor == 11 and sys.version_info.major == 3, - reason="rendered differently on py3.11", -) -skip_py312 = pytest.mark.skipif( - sys.version_info.minor == 12 and sys.version_info.major == 3, - reason="rendered differently on py3.12", -) -skip_py313 = pytest.mark.skipif( - sys.version_info.minor == 13 and sys.version_info.major == 3, - reason="rendered differently on py3.13", +skip_py310_or_later = pytest.mark.skipif( + sys.version_info.minor >= 10 and sys.version_info.major == 3, + reason="rendered differently on py3.10 and later versions", ) @@ -635,10 +623,7 @@ class Nada: assert result == expected -@skip_py310 -@skip_py311 -@skip_py312 -@skip_py313 +@skip_py310_or_later def test_attrs_broken() -> None: @attr.define class Foo: