Forward log_level from plugin

Author: nicoddemus

src/_pytest/subtests.py

@@ -31,6 +31,7 @@
 from _pytest.fixtures import SubRequest
 from _pytest.logging import catching_logs
 from _pytest.logging import LogCaptureHandler
+from _pytest.logging import LoggingPlugin
 from _pytest.reports import TestReport
 from _pytest.runner import CallInfo
 from _pytest.runner import check_interactive_exception
@@ -317,15 +318,17 @@ def capturing_output(request: SubRequest) -> Iterator[Captured]:
 def capturing_logs(
     request: SubRequest,
 ) -> Iterator[CapturedLogs | None]:
-    logging_plugin = request.config.pluginmanager.getplugin("logging-plugin")
+    logging_plugin: LoggingPlugin | None = request.config.pluginmanager.getplugin(
+        "logging-plugin"
+    )
     if logging_plugin is None:
         yield None
     else:
         handler = LogCaptureHandler()
         handler.setFormatter(logging_plugin.formatter)
 
         captured_logs = CapturedLogs(handler)
-        with catching_logs(handler):
+        with catching_logs(handler, level=logging_plugin.log_level):
             yield captured_logs
 
 

testing/test_subtests.py

@@ -769,15 +769,17 @@ def test_foo(subtests):
                 with subtests.test("sub1"):
                     print("sub1 stdout")
                     logging.info("sub1 logging")
+                    logging.debug("sub1 logging debug")
 
                 with subtests.test("sub2"):
                     print("sub2 stdout")
                     logging.info("sub2 logging")
+                    logging.debug("sub2 logging debug")
                     assert False
             """
         )
 
-    def test_capturing(self, pytester: pytest.Pytester) -> None:
+    def test_capturing_info(self, pytester: pytest.Pytester) -> None:
         self.create_file(pytester)
         result = pytester.runpytest("--log-level=INFO")
         result.stdout.fnmatch_lines(
@@ -786,7 +788,29 @@ def test_capturing(self, pytester: pytest.Pytester) -> None:
                 "*-- Captured stdout call --*",
                 "sub2 stdout",
                 "*-- Captured log call ---*",
-                "INFO     root:test_capturing.py:12 sub2 logging",
+                "INFO     * before",
+                "INFO     * sub1 logging",
+                "INFO     * sub2 logging",
+                "*== short test summary info ==*",
+            ]
+        )
+        result.stdout.no_fnmatch_line("sub1 logging debug")
+        result.stdout.no_fnmatch_line("sub2 logging debug")
+
+    def test_capturing_debug(self, pytester: pytest.Pytester) -> None:
+        self.create_file(pytester)
+        result = pytester.runpytest("--log-level=DEBUG")
+        result.stdout.fnmatch_lines(
+            [
+                "*___ test_foo [[]sub2[]] __*",
+                "*-- Captured stdout call --*",
+                "sub2 stdout",
+                "*-- Captured log call ---*",
+                "INFO     * before",
+                "INFO     * sub1 logging",
+                "DEBUG    * sub1 logging debug",
+                "INFO     * sub2 logging",
+                "DEBUG    * sub2 logging debug",
                 "*== short test summary info ==*",
             ]
         )