Clean up pytest style a bit.

Author: ubernostrum

.flake8

@@ -3,3 +3,5 @@ extend-ignore = E203,E501
 extend-select = B950
 max-complexity = 13
 max-line-length = 88
+pytest-parametrize-names-type = list
+pytest-parametrize-values-type = list

noxfile.py

@@ -298,7 +298,7 @@ def lint_flake8(session: nox.Session) -> None:
     Lint code with flake8.
 
     """
-    session.install("flake8", "flake8-bugbear")
+    session.install("flake8", "flake8-bugbear", "flake8-pytest-style")
     session.run(f"python{session.python}", "-Im", "flake8", "--version")
     session.run(
         f"python{session.python}",

tests/async_client/test_api.py

@@ -79,7 +79,7 @@ async def test_verify_key_invalid_explicit(
 
 @pytest.mark.akismet_fixed_response(response_text="invalid")
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -100,12 +100,10 @@ async def test_request_with_invalid_key(
     an invalid API key/URL.
 
     """
+    method = getattr(akismet_async_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.APIKeyError):
-        method = getattr(akismet_async_client_fixed_response, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 @pytest.mark.parametrize(

tests/async_client/test_errors.py

@@ -13,7 +13,7 @@
 pytestmark = [pytest.mark.anyio, pytest.mark.async_client, pytest.mark.constructors]
 
 check_all_methods = pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("key_sites", False),
@@ -37,16 +37,18 @@
 @pytest.mark.parametrize(
     "status_code",
     [
-        pytest.param(code, marks=pytest.mark.akismet_fixed_response(status_code=code))
+        pytest.param(
+            code.value, marks=pytest.mark.akismet_fixed_response(status_code=code)
+        )
         for code in HTTPStatus
         if 400 <= code < 600
     ],
-    ids=[code for code in HTTPStatus if 400 <= code < 600],
+    ids=[code.value for code in HTTPStatus if 400 <= code < 600],
 )
 async def test_error_status(
     akismet_async_client_fixed_response: akismet.AsyncClient,
     akismet_common_kwargs: dict,
-    status_code: HTTPStatus,
+    status_code: int,
     method_name: str,
     pass_args: bool,
 ):
@@ -55,15 +57,13 @@ async def test_error_status(
     code indicating an error.
 
     """
+    method = getattr(akismet_async_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(
         akismet.RequestError,
-        match=f"Akismet responded with error status: {status_code.value}",
+        match=f"Akismet responded with error status: {status_code}",
     ):
-        method = getattr(akismet_async_client_fixed_response, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 @check_all_methods
@@ -78,12 +78,10 @@ async def test_error_timeout(
     RequestError is raised when the request to Akismet times out.
 
     """
+    method = getattr(akismet_async_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Akismet timed out."):
-        method = getattr(akismet_async_client_exception, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 @check_all_methods
@@ -98,12 +96,10 @@ async def test_error_other_httpx(
     RequestError is raised when a generic httpx request error occurs.
 
     """
+    method = getattr(akismet_async_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Error making request to Akismet."):
-        method = getattr(akismet_async_client_exception, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 @check_all_methods
@@ -119,12 +115,10 @@ async def test_error_other(
     request.
 
     """
+    method = getattr(akismet_async_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Error making request to Akismet."):
-        method = getattr(akismet_async_client_exception, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 @pytest.mark.parametrize("method_name", ["comment_check", "submit_ham", "submit_spam"])
@@ -145,7 +139,7 @@ async def test_unknown_argument(
 
 
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -166,9 +160,7 @@ async def test_protocol_error(
     response.
 
     """
+    method = getattr(akismet_async_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.ProtocolError):
-        method = getattr(akismet_async_client_fixed_response, method_name)
-        if pass_args:
-            await method(**akismet_common_kwargs)
-        else:
-            await method()
+        await method(**args)

tests/conftest.py

@@ -259,7 +259,7 @@ def akismet_sync_client(
 @pytest.fixture
 def akismet_async_client(
     akismet_async_class: type[akismet.AsyncClient],
-) -> akismet.SyncClient:
+) -> akismet.AsyncClient:
     """
     Return an (async) Akismet test client.
 

tests/end_to_end/test_async_client.py

@@ -51,7 +51,7 @@ async def test_verify_key_invalid(akismet_bad_config: akismet.Config):
 
 
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -73,12 +73,10 @@ async def test_request_with_invalid_key(
 
     """
     client = akismet.AsyncClient(config=akismet_bad_config)
+    method = getattr(client, method_name)
+    args = akismet_end_to_end_kwargs if pass_args else {}
     with pytest.raises(akismet.APIKeyError):
-        method = getattr(client, method_name)
-        if pass_args:
-            await method(**akismet_end_to_end_kwargs)
-        else:
-            await method()
+        await method(**args)
 
 
 async def test_comment_check_spam(

tests/end_to_end/test_sync_client.py

@@ -51,7 +51,7 @@ def test_verify_key_invalid(akismet_bad_config: akismet.Config):
 
 
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -73,12 +73,10 @@ def test_request_with_invalid_key(
 
     """
     client = akismet.SyncClient(config=akismet_bad_config)
+    method = getattr(client, method_name)
+    args = akismet_end_to_end_kwargs if pass_args else {}
     with pytest.raises(akismet.APIKeyError):
-        method = getattr(client, method_name)
-        if pass_args:
-            method(**akismet_end_to_end_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 def test_comment_check_spam(akismet_end_to_end_kwargs: dict, akismet_spam_author: str):

tests/sync_client/test_api.py

@@ -79,7 +79,7 @@ def test_verify_key_invalid_explicit(
 
 @pytest.mark.akismet_fixed_response(response_text="invalid")
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -100,12 +100,10 @@ def test_request_with_invalid_key(
     an invalid API key/URL.
 
     """
+    method = getattr(akismet_sync_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.APIKeyError):
-        method = getattr(akismet_sync_client_fixed_response, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 @pytest.mark.parametrize(

tests/sync_client/test_errors.py

@@ -13,7 +13,7 @@
 pytestmark = [pytest.mark.errors, pytest.mark.sync_client]
 
 check_all_methods = pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("key_sites", False),
@@ -37,16 +37,18 @@
 @pytest.mark.parametrize(
     "status_code",
     [
-        pytest.param(code, marks=pytest.mark.akismet_fixed_response(status_code=code))
+        pytest.param(
+            code.value, marks=pytest.mark.akismet_fixed_response(status_code=code)
+        )
         for code in HTTPStatus
         if 400 <= code < 600
     ],
-    ids=[code for code in HTTPStatus if 400 <= code < 600],
+    ids=[code.value for code in HTTPStatus if 400 <= code < 600],
 )
 def test_error_status(
     akismet_sync_client_fixed_response: akismet.SyncClient,
     akismet_common_kwargs: dict,
-    status_code: HTTPStatus,
+    status_code: int,
     method_name: str,
     pass_args: bool,
 ):
@@ -55,15 +57,13 @@ def test_error_status(
     code indicating an error.
 
     """
+    method = getattr(akismet_sync_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(
         akismet.RequestError,
-        match=f"Akismet responded with error status: {status_code.value}",
+        match=f"Akismet responded with error status: {status_code}",
     ):
-        method = getattr(akismet_sync_client_fixed_response, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 @check_all_methods
@@ -78,12 +78,10 @@ def test_error_timeout(
     RequestError is raised when the request to Akismet times out.
 
     """
+    method = getattr(akismet_sync_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Akismet timed out."):
-        method = getattr(akismet_sync_client_exception, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 @check_all_methods
@@ -98,12 +96,10 @@ def test_error_other_httpx(
     RequestError is raised when a generic httpx request error occurs.
 
     """
+    method = getattr(akismet_sync_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Error making request to Akismet."):
-        method = getattr(akismet_sync_client_exception, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 @check_all_methods
@@ -119,12 +115,10 @@ def test_error_other(
     request.
 
     """
+    method = getattr(akismet_sync_client_exception, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.RequestError, match="Error making request to Akismet."):
-        method = getattr(akismet_sync_client_exception, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)
 
 
 @pytest.mark.parametrize("method_name", ["comment_check", "submit_ham", "submit_spam"])
@@ -145,7 +139,7 @@ def test_unknown_argument(
 
 
 @pytest.mark.parametrize(
-    "method_name,pass_args",
+    ["method_name", "pass_args"],
     [
         ("comment_check", True),
         ("submit_ham", True),
@@ -166,9 +160,7 @@ def test_protocol_error(
     response.
 
     """
+    method = getattr(akismet_sync_client_fixed_response, method_name)
+    args = akismet_common_kwargs if pass_args else {}
     with pytest.raises(akismet.ProtocolError):
-        method = getattr(akismet_sync_client_fixed_response, method_name)
-        if pass_args:
-            method(**akismet_common_kwargs)
-        else:
-            method()
+        method(**args)