Fix test

Author: benoit-cty

tests/test_rapl_mmio_scanning.py

@@ -14,7 +14,7 @@
 
 
 @pytest.mark.skipif(not sys.platform.lower().startswith("lin"), reason="requires Linux")
-def test_multiple_rapl_providers_with_mixed_permissions(tmp_path, caplog):
+def test_multiple_rapl_providers_with_mixed_permissions(tmp_path):
     """
     Verify that multiple RAPL providers (intel-rapl and intel-rapl-mmio) are
     scanned, and permission errors on one provider don't prevent using the other.
@@ -44,7 +44,19 @@ def test_multiple_rapl_providers_with_mixed_permissions(tmp_path, caplog):
 
     # Make the MMIO energy file unreadable
     mode_before = energy_mmio.stat().st_mode
-    caplog.set_level(logging.WARNING, logger="codecarbon")
+
+    # Add a custom handler to capture warnings (since logger.propagate = False)
+    from codecarbon.external.logger import logger as codecarbon_logger
+
+    log_records = []
+
+    class TestHandler(logging.Handler):
+        def emit(self, record):
+            log_records.append(record)
+
+    test_handler = TestHandler()
+    test_handler.setLevel(logging.WARNING)
+    codecarbon_logger.addHandler(test_handler)
 
     try:
         os.chmod(energy_mmio, 0)
@@ -60,13 +72,14 @@ def test_multiple_rapl_providers_with_mixed_permissions(tmp_path, caplog):
         assert "intel-rapl/intel-rapl:0/energy_uj" in rapl._rapl_files[0].path
 
         # A warning should be emitted for the unreadable MMIO domain
-        messages = [r.getMessage() for r in caplog.records]
+        messages = [r.getMessage() for r in log_records]
         assert any(
             "Permission denied reading RAPL file" in m and "intel-rapl-mmio" in m
             for m in messages
         ), f"Expected permission warning for intel-rapl-mmio, got: {messages}"
 
     finally:
+        codecarbon_logger.removeHandler(test_handler)
         try:
             os.chmod(energy_mmio, stat.S_IMODE(mode_before) or 0o644)
         except Exception:

tests/test_rapl_permissions.py

@@ -54,7 +54,7 @@ def test_main_rapl_permission_error(tmp_path):
 
 
 @pytest.mark.skipif(not sys.platform.lower().startswith("lin"), reason="requires Linux")
-def test_non_main_rapl_permission_warning_and_skip(tmp_path, caplog):
+def test_non_main_rapl_permission_warning_and_skip(tmp_path):
     """If a non-main domain (e.g. psys) is unreadable, it should be skipped and warn."""
     base = tmp_path
     # Create proper RAPL hierarchy: base/intel-rapl/intel-rapl:N/
@@ -76,7 +76,20 @@ def test_non_main_rapl_permission_warning_and_skip(tmp_path, caplog):
 
     # Make the non-main energy file unreadable
     mode_before = energy1.stat().st_mode
-    caplog.set_level(logging.WARNING, logger="codecarbon")
+
+    # Add a custom handler to capture warnings (since logger.propagate = False)
+    from codecarbon.external.logger import logger as codecarbon_logger
+
+    log_records = []
+
+    class TestHandler(logging.Handler):
+        def emit(self, record):
+            log_records.append(record)
+
+    test_handler = TestHandler()
+    test_handler.setLevel(logging.WARNING)
+    codecarbon_logger.addHandler(test_handler)
+
     try:
         os.chmod(energy1, 0)
         rapl = IntelRAPL(rapl_dir=str(base))
@@ -85,13 +98,14 @@ def test_non_main_rapl_permission_warning_and_skip(tmp_path, caplog):
         assert rapl._rapl_files[0].path.endswith("intel-rapl/intel-rapl:0/energy_uj")
 
         # A warning about permission denied should be emitted
-        messages = [r.getMessage() for r in caplog.records]
+        messages = [r.getMessage() for r in log_records]
         assert any(
             "Permission denied reading RAPL file" in m
             or "Permission denied listing" in m
             for m in messages
-        )
+        ), f"Expected permission warning, got: {messages}"
     finally:
+        codecarbon_logger.removeHandler(test_handler)
         try:
             os.chmod(energy1, stat.S_IMODE(mode_before) or 0o644)
         except Exception: