logging.py: Don't change log level of the root logger to bigger numer…

…ic value
pytest-dev · Mar 14, 2018 · ec68803 · ec68803
1 parent b2b629f
commit ec68803
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/_pytest/logging.py b/_pytest/logging.py
@@ -153,7 +153,7 @@ def catching_logs(handler, formatter=None, level=None):
         root_logger.addHandler(handler)
     if level is not None:
         orig_level = root_logger.level
-        root_logger.setLevel(level)
+        root_logger.setLevel(min(orig_level, level))
     try:
         yield handler
     finally: