From fd72781907ffd932cf242d88a8d7c3f5a836dfe8 Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 18 Mar 2025 09:07:28 +0200 Subject: [PATCH 1/3] test passes on PyPy macOS --- tests/test_exceptions.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 47214a7029..869b85438e 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -74,12 +74,6 @@ def test_cross_module_exceptions(msg): assert str(excinfo.value) == "'just local'" -# TODO: FIXME -@pytest.mark.xfail( - "env.MACOS and env.PYPY", - raises=RuntimeError, - reason="See Issue #2847, PR #2999, PR #4324", -) def test_cross_module_exception_translator(): with pytest.raises(KeyError): # translator registered in cross_module_tests From 1ffb9af69b669c6b0198d3cab22f0ad26c102786 Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Thu, 20 Mar 2025 11:55:32 +0200 Subject: [PATCH 2/3] revert, set strict=False instead --- tests/test_exceptions.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 869b85438e..5e1d20dbac 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -74,6 +74,13 @@ def test_cross_module_exceptions(msg): assert str(excinfo.value) == "'just local'" +# TODO: FIXME +@pytest.mark.xfail( + "env.MACOS and env.PYPY", + raises=RuntimeError, + reason="See Issue #2847, PR #2999, PR #4324", + strict=False, +) def test_cross_module_exception_translator(): with pytest.raises(KeyError): # translator registered in cross_module_tests From 245b172eda97b213b9b3c106ba000e775e9ef443 Mon Sep 17 00:00:00 2001 From: Matti Picus Date: Fri, 21 Mar 2025 06:20:04 +0200 Subject: [PATCH 3/3] Tweak condition for strict Co-authored-by: Henry Schreiner --- tests/test_exceptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 5e1d20dbac..921540194a 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -79,7 +79,7 @@ def test_cross_module_exceptions(msg): "env.MACOS and env.PYPY", raises=RuntimeError, reason="See Issue #2847, PR #2999, PR #4324", - strict=False, + strict=not env.PYPY, # PR 5569 ) def test_cross_module_exception_translator(): with pytest.raises(KeyError):