fix tests and simplify docstrings

Author: czerwiukk

fishjam/api/_fishjam_client.py

@@ -1,6 +1,7 @@
 """Fishjam client used to manage rooms."""
 
 from dataclasses import dataclass, field
+from http import HTTPStatus
 from typing import Any, Literal, cast
 
 from fishjam._openapi_client.api.credentials import (
@@ -55,7 +56,6 @@
 from fishjam.api._client import Client
 from fishjam.errors import (
     InvalidFishjamCredentialsError,
-    NotFoundError,
 )
 
 
@@ -174,7 +174,7 @@ def __init__(
     def create_and_verify(
         cls, *, fishjam_id: str, management_token: str
     ) -> "FishjamClient":
-        """Construct a FishjamClient and verify credentials against the backend.
+        """Construct a FishjamClient and verify its credentials against the backend.
 
         Args:
             fishjam_id: The unique identifier for the Fishjam instance.
@@ -184,29 +184,23 @@ def create_and_verify(
             FishjamClient: A client whose credentials have been verified.
 
         Raises:
-            InvalidFishjamCredentialsError: If the ``fishjam_id`` /
-                ``management_token`` pair is rejected by the backend.
+            InvalidFishjamCredentialsError: If the token is rejected.
         """
         client = cls(fishjam_id=fishjam_id, management_token=management_token)
         client.check_credentials()
         return client
 
     def check_credentials(self) -> None:
-        """Verify configured credentials by pinging the backend.
-
-        Performs a single lightweight ``get_all_rooms`` call. A 401 or 404
-        from the backend is translated into
-        :class:`InvalidFishjamCredentialsError`; other HTTP errors propagate
-        as their normal mapped types.
+        """Verify the management token via a single ``/validate`` call.
 
         Raises:
-            InvalidFishjamCredentialsError: If the ``fishjam_id`` /
-                ``management_token`` pair is rejected by the backend.
+            InvalidFishjamCredentialsError: If the token is rejected.
         """
-        try:
-            self._request(credentials_validate_credentials)
-        except NotFoundError as exc:
-            raise InvalidFishjamCredentialsError(*exc.args) from exc
+        response = credentials_validate_credentials.sync_detailed(client=self.client)
+        self._handle_deprecation_header(response.headers)
+
+        if response.status_code == HTTPStatus.NOT_FOUND:
+            raise InvalidFishjamCredentialsError("Invalid Fishjam credentials")
 
     def create_peer(
         self,

tests/test_config_validation.py

@@ -1,19 +1,25 @@
 # pylint: disable=missing-class-docstring, missing-function-docstring, missing-module-docstring
 
-from unittest.mock import patch
+from http import HTTPStatus
+from unittest.mock import Mock, patch
 
 import pytest
 
 from fishjam import FishjamClient
 from fishjam.errors import (
     InvalidFishjamCredentialsError,
     MissingFishjamIdError,
-    NotFoundError,
 )
 
 VALID_FISHJAM_ID = "fjm_test"
 VALID_MANAGEMENT_TOKEN = "tok_test"
 
+VALIDATE = "fishjam.api._fishjam_client.credentials_validate_credentials.sync_detailed"
+
+
+def _response(status: HTTPStatus):
+    return Mock(status_code=status, headers={})
+
 
 class TestSyncValidation:
     def test_empty_fishjam_id_raises(self):
@@ -28,42 +34,34 @@ def test_both_provided_does_not_raise(self):
 
 class TestLiveCheck:
     def test_create_and_verify_raises_invalid_credentials_on_404(self):
-        with patch.object(
-            FishjamClient,
-            "_request",
-            side_effect=NotFoundError("Fishjam not found"),
-        ):
+        with patch(VALIDATE, return_value=_response(HTTPStatus.NOT_FOUND)):
             with pytest.raises(InvalidFishjamCredentialsError):
                 FishjamClient.create_and_verify(
                     fishjam_id=VALID_FISHJAM_ID,
                     management_token=VALID_MANAGEMENT_TOKEN,
                 )
 
     def test_create_and_verify_returns_client_and_pings_once(self):
-        with patch.object(FishjamClient, "_request", return_value=None) as mock_request:
+        with patch(VALIDATE, return_value=_response(HTTPStatus.OK)) as mock_validate:
             client = FishjamClient.create_and_verify(
                 fishjam_id=VALID_FISHJAM_ID,
                 management_token=VALID_MANAGEMENT_TOKEN,
             )
 
             assert isinstance(client, FishjamClient)
-            assert mock_request.call_count == 1
+            assert mock_validate.call_count == 1
 
     def test_check_credentials_raises_invalid_credentials_on_404(self):
         client = FishjamClient(
             fishjam_id=VALID_FISHJAM_ID, management_token=VALID_MANAGEMENT_TOKEN
         )
-        with patch.object(
-            FishjamClient,
-            "_request",
-            side_effect=NotFoundError("Fishjam not found"),
-        ):
+        with patch(VALIDATE, return_value=_response(HTTPStatus.NOT_FOUND)):
             with pytest.raises(InvalidFishjamCredentialsError):
                 client.check_credentials()
 
     def test_check_credentials_returns_none_on_success(self):
         client = FishjamClient(
             fishjam_id=VALID_FISHJAM_ID, management_token=VALID_MANAGEMENT_TOKEN
         )
-        with patch.object(FishjamClient, "_request", return_value=None):
+        with patch(VALIDATE, return_value=_response(HTTPStatus.OK)):
             assert client.check_credentials() is None