From 437c1925dcc0d124fbf854afeec39806764c58fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= Date: Mon, 18 Sep 2023 14:45:16 -0600 Subject: [PATCH] test: Add an `_xfail_due_to_version` helper function --- tests/test_integration.py | 52 ++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index d896a61c..5dd4ec24 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -24,6 +24,23 @@ NEW_SURVEY_NAME = "New Survey" +def _xfail_due_to_version( + request: pytest.FixtureRequest, + server_version: semver.Version, + check_version: tuple[int, ...], + reason: str, + **kwargs: t.Any, +) -> None: + if server_version < check_version: + request.node.add_marker( + pytest.mark.xfail( + reason=reason, + raises=requests.exceptions.HTTPError, + **kwargs, + ), + ) + + @pytest.fixture(scope="module") def client( integration_url: str, @@ -257,16 +274,12 @@ def test_quota( survey_id: int, ): """Test quota methods.""" - if server_version < (6, 0, 0): - request.node.add_marker( - pytest.mark.xfail( - reason=( - "Quota RPC methods are not supported in LimeSurvey " - f"{server_version} < 6.0.0" - ), - raises=requests.exceptions.HTTPError, - ), - ) + _xfail_due_to_version( + request, + server_version, + (6, 0, 0), + f"Quota RPC methods are not supported in LimeSurvey {server_version} < 6.0.0", + ) with pytest.raises(LimeSurveyStatusError, match="No quotas found"): client.list_quotas(survey_id) @@ -566,16 +579,15 @@ def test_get_available_site_settings( server_version: semver.Version, ): """Test getting available site settings.""" - if server_version < (6, 0, 0): - request.node.add_marker( - pytest.mark.xfail( - reason=( - "RPC method `get_available_site_settings` is not supported in " - f"LimeSurvey {server_version} < 6.0.0" - ), - raises=requests.exceptions.HTTPError, - ), - ) + _xfail_due_to_version( + request, + server_version, + (6, 0, 0), + ( + "RPC method `get_available_site_settings` is not supported in LimeSurvey " + f"{server_version} < 6.0.0" + ), + ) assert client.get_available_site_settings()