From a3935ec7355f3757dcd772a2d33b588a4fa673f7 Mon Sep 17 00:00:00 2001
From: tligui_y <yasmine.tligui@psi.ch>
Date: Mon, 28 Jul 2025 16:03:54 +0200
Subject: [PATCH] Update tests/test_utils_logign.py

---
 tests/test_utils_logign.py | 85 ++++++++++++++++++++++++++++----------
 1 file changed, 64 insertions(+), 21 deletions(-)

diff --git a/tests/test_utils_logign.py b/tests/test_utils_logign.py
index 5f3331606..e71566635 100644
--- a/tests/test_utils_logign.py
+++ b/tests/test_utils_logign.py
@@ -10,37 +10,80 @@ from slic.utils.logcfg import add_log_Level, logcfg
 import logzero
 from logzero import logger as log, LogFormatter
 
-import logging
-import pytest
-import sys
-from logzero import logger as log, LogFormatter
+# Configure logging for pytest capture
+@pytest.fixture(scope="function", autouse=True)
+def setup_logging():
 
-@pytest.fixture(scope="function", autouse=True)  # Changé à "function"
-def setup_logger():
-    # Configure le logger avant CHAQUE test
-    for h in log.handlers[:]:
-        log.removeHandler(h)
+    # Clear existing handlers
+    for handler in log.handlers[:]:
+        log.removeHandler(handler)
     
+    # Add new handler to stderr (will be captured by pytest)
     handler = logging.StreamHandler(sys.stderr)
     handler.setFormatter(LogFormatter())
     log.addHandler(handler)
     
+    # Setup custom log levels
     add_log_Level(log, "ENLARGE", logging.INFO + 5, func_name="enlarge")
-    log.setLevel(logging.DEBUG)  # Niveau global
+    log.setLevel(logging.DEBUG)  # Capture all levels
 
-def test_ignore_log_msg_filter(capfd):
-    """Test inspiré de celui qui fonctionne dans test_utils_logcfg.py"""
-    # Clear capture
+# Test cases for log message filtering
+@pytest.mark.parametrize("level,msg,should_appear", [
+    ("WARNING", "warn to ignore", False),
+    ("WARNING", "warn to keep", True),
+    ("INFO", "info message", True),
+    ("ENLARGE", "enlarge to ignore", False), 
+    ("ENLARGE", "other enlarge", True),
+])
+def test_ignore_log_msg_filter(capfd, level, msg, should_appear):
+    # Clear previous captures
     capfd.readouterr()
     
-    # Test
-    with ignore_log_msg(log, lvl="WARNING", msg="test msg"):
-        log.warning("test msg")
-        log.warning("other msg")
+    # Test the filter
+    with ignore_log_msg(log, lvl=level, msg=msg):
+        log.warning("warn to ignore")
+        log.warning("warn to keep")
+        log.info("info message")
+        log.enlarge("enlarge to ignore")
+        log.enlarge("other enlarge")
     
-    # Capture
+    # Verify results
     captured = capfd.readouterr().err
-    print("CAPTURED:", repr(captured))  # Debug
+    if should_appear:
+        assert msg in captured, f"Message '{msg}' should appear in logs"
+    else:
+        assert msg not in captured, f"Message '{msg}' should be filtered"
+
+def test_ignore_only_by_level(capfd):
+    capfd.readouterr()
     
-    assert "test msg" not in captured
-    assert "other msg" in captured
\ No newline at end of file
+    with ignore_log_msg(log, lvl="WARNING", msg=None):
+        log.warning("should be ignored")
+        log.info("should appear")
+    
+    captured = capfd.readouterr().err
+    assert "should be ignored" not in captured
+    assert "should appear" in captured
+
+def test_ignore_only_by_msg(capfd):
+    capfd.readouterr()
+    
+    with ignore_log_msg(log, lvl=None, msg="skip this"):
+        log.warning("skip this")
+        log.warning("keep this")
+    
+    captured = capfd.readouterr().err
+    assert "skip this" not in captured
+    assert "keep this" in captured
+
+def test_filter_removed_after_context(capfd):
+    capfd.readouterr()
+    
+    # Filter during context
+    with ignore_log_msg(log, lvl="WARNING", msg="temp msg"):
+        log.warning("temp msg")
+    
+    # Should log after context
+    log.warning("temp msg")
+    captured = capfd.readouterr().err
+    assert "temp msg" in captured
\ No newline at end of file