Merge branch 'master' into Derra_Branch

nikola/log.py

@@ -127,7 +127,8 @@ def configure_logging(logging_mode: LoggingMode = LoggingMode.NORMAL) -> None:
 
 def print_coverage_configure():
     for branch, hit in branch_coverage_configure.items():
-        print(f"configure {branch} was {'hit' if hit else 'not hit'}")
+    print(f"configure {branch} was {'hit' if hit else 'not hit'}")
+
 def reset_coverage_configure():
     for key in branch_coverage_configure:
         branch_coverage_configure[key] = False

tests/test_configure_logging.py

@@ -0,0 +1,38 @@
+from nikola.log import configure_logging, print_coverage_configure, reset_coverage_configure, LoggingMode
+from unittest.mock import patch
+
+
+def test_normal_mode_debug():
+    reset_coverage_configure()
+    with patch('nikola.log.DEBUG', True):
+        configure_logging(logging_mode=LoggingMode.NORMAL)
+        print_coverage_configure()
+
+
+def test_normal_mode_no_debug():
+    reset_coverage_configure()
+    configure_logging(logging_mode=LoggingMode.NORMAL)
+    print_coverage_configure()
+
+
+def test_quiet_mode_debug():
+    reset_coverage_configure()
+    with patch('nikola.log.DEBUG', True):
+        configure_logging(logging_mode=LoggingMode.QUIET)
+        print_coverage_configure()
+
+def test_quiet_mode_no_debug():
+    reset_coverage_configure()
+    configure_logging(logging_mode=LoggingMode.QUIET)
+    print_coverage_configure()
+
+def test_strict_mode_debug():
+    reset_coverage_configure()
+    with patch('nikola.log.DEBUG', True):
+        configure_logging(logging_mode=LoggingMode.STRICT)
+        print_coverage_configure()
+
+def test_strict_mode_no_debug():
+    reset_coverage_configure()
+    configure_logging(logging_mode=LoggingMode.STRICT)
+    print_coverage_configure()