Get correct logger and do not mess with global state

Author: samdoran

tests/unit/authorization/test_azure_token_manager.py

@@ -2,7 +2,6 @@
 
 # pylint: disable=protected-access
 
-import logging
 import time
 from collections.abc import Generator
 from typing import Any
@@ -13,7 +12,6 @@
 from pydantic import SecretStr
 from pytest_mock import MockerFixture
 
-from authorization import azure_token_manager
 from authorization.azure_token_manager import (
     TOKEN_EXPIRATION_LEEWAY,
     AzureEntraIDManager,
@@ -138,15 +136,13 @@ def test_refresh_token_failure_logs_error(
             return_value=mock_credential_instance,
         )
 
-        azure_logger = logging.getLogger(azure_token_manager.__name__)
-        azure_logger.propagate = True
-        try:
-            with caplog.at_level("WARNING"):
-                result = token_manager.refresh_token()
-                assert result is False
-                assert "Failed to retrieve Azure access token" in caplog.text
-        finally:
-            azure_logger.propagate = False
+        with caplog.at_level(
+            "WARNING", logger="lightspeed_stack.authorization.azure_token_manager"
+        ):
+            result = token_manager.refresh_token()
+
+        assert result is False
+        assert "Failed to retrieve Azure access token" in caplog.text
 
     def test_token_expired_property_dynamic(
         self, token_manager: AzureEntraIDManager, mocker: MockerFixture

tests/unit/models/config/test_rlsapi_v1_configuration.py

@@ -133,15 +133,10 @@ def test_quota_subject_warns_when_no_limiters(caplog: pytest.LogCaptureFixture)
         authentication={"module": "noop"},
         quota_handlers={},
     )
-    config_logger = logging.getLogger("models.config")
-    config_logger.propagate = True
-    try:
-        with caplog.at_level(logging.WARNING):
-            Configuration(**config_dict)
+    with caplog.at_level(logging.WARNING, logger="lightspeed_stack.models.config"):
+        Configuration(**config_dict)
 
-        assert "quota enforcement is not fully configured" in caplog.text
-    finally:
-        config_logger.propagate = False
+    assert "quota enforcement is not fully configured" in caplog.text
 
 
 def test_quota_subject_warns_when_no_storage_backend(
@@ -163,12 +158,7 @@ def test_quota_subject_warns_when_no_storage_backend(
             ],
         },
     )
-    config_logger = logging.getLogger("models.config")
-    config_logger.propagate = True
-    try:
-        with caplog.at_level(logging.WARNING):
-            Configuration(**config_dict)
-
-        assert "quota enforcement is not fully configured" in caplog.text
-    finally:
-        config_logger.propagate = False
+    with caplog.at_level(logging.WARNING, logger="lightspeed_stack.models.config"):
+        Configuration(**config_dict)
+
+    assert "quota enforcement is not fully configured" in caplog.text