Update tests

Author: samdoran

tests/unit/test_log.py

@@ -3,34 +3,38 @@
 import logging
 
 import pytest
-from pytest_mock import MockerFixture
-from rich.logging import RichHandler
 
 from constants import (
-    DEFAULT_LOG_FORMAT,
-    LIGHTSPEED_STACK_DISABLE_RICH_HANDLER_ENV_VAR,
+    DEFAULT_LOGGER_NAME,
     LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR,
 )
-from log import create_log_handler, get_logger, resolve_log_level
+from log import get_logger, resolve_log_level, setup_logging
+
+
+@pytest.fixture(autouse=True)
+def clear_logging_cache():
+    setup_logging.cache_clear()
 
 
 def test_get_logger() -> None:
     """Check the function to retrieve logger."""
-    logger_name = "foo"
-    logger = get_logger(logger_name)
-    assert logger is not None
-    assert logger.name == logger_name
+    setup_logging()
 
-    # at least one handler need to be set
-    assert len(logger.handlers) >= 1
+    logger = get_logger(__name__)
+
+    assert logger is not None
+    assert logger.name == f"{DEFAULT_LOGGER_NAME}.tests.unit.test_log"
+    assert logger.hasHandlers()
 
 
 def test_get_logger_invalid_env_var_fallback(monkeypatch: pytest.MonkeyPatch) -> None:
     """Test that invalid env var value falls back to INFO level."""
     monkeypatch.setenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, "FOOBAR")
 
-    logger = get_logger("test_invalid")
-    assert logger.level == logging.INFO
+    setup_logging()
+
+    logger = get_logger(__name__)
+    assert logger.getEffectiveLevel() == logging.INFO
 
 
 @pytest.mark.parametrize(
@@ -59,16 +63,20 @@ def test_get_logger_log_level(
     """
     monkeypatch.setenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, level_name)
 
-    logger = get_logger(f"test_{level_name}")
-    assert logger.level == expected_level
+    setup_logging()
+
+    logger = get_logger(__name__)
+    assert logger.getEffectiveLevel() == expected_level
 
 
 def test_get_logger_default_log_level(monkeypatch: pytest.MonkeyPatch) -> None:
     """Test that get_logger() uses INFO level by default when env var is not set."""
     monkeypatch.delenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, raising=False)
 
-    logger = get_logger("test_default")
-    assert logger.level == logging.INFO
+    setup_logging()
+
+    logger = get_logger(__name__)
+    assert logger.getEffectiveLevel() == logging.INFO
 
 
 @pytest.mark.parametrize(
@@ -88,73 +96,25 @@ def test_resolve_log_level(
 ) -> None:
     """Test that resolve_log_level correctly resolves valid level names."""
     monkeypatch.setenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, level_name)
+
+    setup_logging()
+
     assert resolve_log_level() == expected_level
 
 
 def test_resolve_log_level_invalid_fallback(monkeypatch: pytest.MonkeyPatch) -> None:
     """Test that resolve_log_level falls back to INFO for invalid values."""
     monkeypatch.setenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, "BOGUS")
+
+    setup_logging()
+
     assert resolve_log_level() == logging.INFO
 
 
 def test_resolve_log_level_default(monkeypatch: pytest.MonkeyPatch) -> None:
     """Test that resolve_log_level defaults to INFO when env var is unset."""
     monkeypatch.delenv(LIGHTSPEED_STACK_LOG_LEVEL_ENV_VAR, raising=False)
-    assert resolve_log_level() == logging.INFO
-
 
-def test_create_log_handler_tty(mocker: MockerFixture) -> None:
-    """Test that create_log_handler returns RichHandler when TTY is available."""
-    mocker.patch("sys.stderr.isatty", return_value=True)
-    handler = create_log_handler()
-    assert isinstance(handler, RichHandler)
+    setup_logging()
 
-
-def test_create_log_handler_non_tty(mocker: MockerFixture) -> None:
-    """Test that create_log_handler returns StreamHandler when no TTY."""
-    mocker.patch("sys.stderr.isatty", return_value=False)
-    handler = create_log_handler()
-    assert isinstance(handler, logging.StreamHandler)
-    assert not isinstance(handler, RichHandler)
-
-
-def test_create_log_handler_non_tty_format(mocker: MockerFixture) -> None:
-    """Test that non-TTY handler uses DEFAULT_LOG_FORMAT."""
-    mocker.patch("sys.stderr.isatty", return_value=False)
-    handler = create_log_handler()
-    assert handler.formatter is not None
-    # pylint: disable=protected-access
-    assert handler.formatter._fmt == DEFAULT_LOG_FORMAT
-
-
-def test_create_log_handler_disable_rich_with_tty(
-    mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Test that RichHandler is disabled when env var is set, even with TTY."""
-    mocker.patch("sys.stderr.isatty", return_value=True)
-    monkeypatch.setenv(LIGHTSPEED_STACK_DISABLE_RICH_HANDLER_ENV_VAR, "1")
-    handler = create_log_handler()
-    assert isinstance(handler, logging.StreamHandler)
-    assert not isinstance(handler, RichHandler)
-
-
-def test_create_log_handler_disable_rich_format(
-    mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Test that disabled RichHandler uses DEFAULT_LOG_FORMAT."""
-    mocker.patch("sys.stderr.isatty", return_value=True)
-    monkeypatch.setenv(LIGHTSPEED_STACK_DISABLE_RICH_HANDLER_ENV_VAR, "true")
-    handler = create_log_handler()
-    assert handler.formatter is not None
-    # pylint: disable=protected-access
-    assert handler.formatter._fmt == DEFAULT_LOG_FORMAT
-
-
-def test_create_log_handler_enable_rich_when_env_var_empty(
-    mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Test that RichHandler is used when env var is empty string."""
-    mocker.patch("sys.stderr.isatty", return_value=True)
-    monkeypatch.setenv(LIGHTSPEED_STACK_DISABLE_RICH_HANDLER_ENV_VAR, "")
-    handler = create_log_handler()
-    assert isinstance(handler, RichHandler)
+    assert resolve_log_level() == logging.INFO