test: Use native Pytest 9+ support for subtests

Author: edgarrmondragon

docs/how-to.md

@@ -9,7 +9,7 @@ For the full JSON-RPC reference, see the [RemoteControl 2 API docs][rc2api].
 :end-before: end example
 ```
 
-Otherwise, you can manually close the session with {meth}`client.close() <citric.client.Client.close>`.
+Otherwise, you can manually close the session with {meth}`client.close() <citric.Client.close>`.
 
 ## Get surveys and questions
 

pyproject.toml

@@ -68,7 +68,6 @@ test = [
   "pytest-github-actions-annotate-failures>=0.1.7",
   "pytest-httpserver>=1.0.8",
   "pytest-randomly>=3.15",
-  "pytest-subtests>=0.11",
   "python-dotenv>=1",
   "semver>=3.0.1",
   "tinydb>=4.8",
@@ -248,7 +247,7 @@ DEP004 = [
 [tool.pyproject-fmt]
 max_supported_python = "3.15"
 
-[tool.pytest.ini_options]
+[tool.pytest]
 addopts = [
   "--durations=5",
   "-ra",              # show extra test summary info for all except passed
@@ -264,7 +263,7 @@ markers = [
   "integration_test: Integration and end-to-end tests",
   "xfail_mysql: Mark a test as expected to fail on MySQL",
 ]
-minversion = "8"
+minversion = "9.0.0"
 testpaths = [
   "tests",
 ]

tests/integration/test_rpc_client.py

@@ -25,7 +25,6 @@
 
 if TYPE_CHECKING:
     from faker import Faker
-    from pytest_subtests import SubTests
 
     from citric.types import QuestionsListElement
     from tests.fixtures import MailpitClient
@@ -65,7 +64,7 @@ def participants(faker: Faker) -> list[dict[str, Any]]:
 
 
 @pytest.mark.integration_test
-def test_fieldmap(client: citric.Client, survey_id: int, subtests: SubTests):
+def test_fieldmap(client: citric.Client, survey_id: int, subtests: pytest.Subtests):
     """Test fieldmap."""
     fieldmap = client.get_fieldmap(survey_id)
     for key, value in fieldmap.items():
@@ -79,7 +78,7 @@ def test_fieldmap(client: citric.Client, survey_id: int, subtests: SubTests):
 
 
 @pytest.mark.integration_test
-def test_language(client: citric.Client, survey_id: int, subtests: SubTests):
+def test_language(client: citric.Client, survey_id: int, subtests: pytest.Subtests):
     """Test language methods."""
     # Add a new language
     assert client.add_language(survey_id, "es")["status"] == "OK"
@@ -125,7 +124,7 @@ def test_language(client: citric.Client, survey_id: int, subtests: SubTests):
 def test_survey(
     client: citric.Client,
     server_version: semver.VersionInfo,
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test survey methods."""
     # Try to get a survey that doesn't exist
@@ -179,7 +178,7 @@ def test_survey(
 
 
 @pytest.mark.integration_test
-def test_import_survey(client: citric.Client, subtests: SubTests):
+def test_import_survey(client: citric.Client, subtests: pytest.Subtests):
     """Test importing a survey with a custom ID and name."""
     survey_id = random.randint(10000, 20000)  # noqa: S311
     with Path("./examples/survey.lss").open("rb") as f:
@@ -417,7 +416,7 @@ def test_quota(
     client: citric.Client,
     server_version: semver.VersionInfo,
     survey_id: int,
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test quota methods."""
     request.applymarker(
@@ -623,7 +622,7 @@ def test_participants(
     client: citric.Client,
     survey_id: int,
     participants: list[dict[str, str]],
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test participants methods."""
     client.activate_survey(survey_id)
@@ -762,7 +761,7 @@ def test_responses(
     survey_id: int,
     responses: list[dict],
     tmp_path: Path,
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test adding and exporting responses."""
     client.activate_survey(survey_id)
@@ -872,7 +871,7 @@ def test_summary(
     survey_id: int,
     participants: list[dict],
     responses: list[dict],
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test get_summary client method."""
     with (
@@ -1202,7 +1201,7 @@ def test_mail_registered_participants(
     survey_id: int,
     participants: list[dict[str, str]],
     mailpit: MailpitClient,
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test mail_registered_participants."""
     client.activate_survey(survey_id)
@@ -1246,7 +1245,7 @@ def test_remind_participants(
     survey_id: int,
     participants: list[dict[str, str]],
     mailpit: MailpitClient,
-    subtests: SubTests,
+    subtests: pytest.Subtests,
 ):
     """Test remind_participants."""
     client.activate_survey(survey_id)