From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 13 Mar 2006 04:50:34 +0000 (+0000)
Subject: Merge rev 41859 from the trunk.
X-Git-Tag: v2.4.3c1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1baff3cffdaa0bdf86ad2a0e8dbe9d56dd18d405;p=thirdparty%2FPython%2Fcpython.git

Merge rev 41859 from the trunk.

test_main():  Restore the original root logger level after running
the tests.  This stops the confusing/annoying:

    No handlers could be found for logger "cookielib"

message we got whenever some test running after test_logging
happened to use cookielib.py (when not using regrtest's -r,
this happened during test_urllib2; when using -r, it varied).
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 64ca5711d67b..62c0b08a47c1 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -487,11 +487,20 @@ def test_main():
         # or a Mac OS X box which supports very little locale stuff at all
         original_locale = None
 
+    # Save and restore the original root logger level across the tests.
+    # Otherwise, e.g., if any test using cookielib runs after test_logging,
+    # cookielib's debug-level logger tries to log messages, leading to
+    # confusing:
+    #    No handlers could be found for logger "cookielib"
+    # output while the tests are running.
+    root_logger = logging.getLogger("")
+    original_logging_level = root_logger.getEffectiveLevel()
     try:
         test_main_inner()
     finally:
         if original_locale is not None:
             locale.setlocale(locale.LC_ALL, original_locale)
+        root_logger.setLevel(original_logging_level)
 
 if __name__ == "__main__":
     sys.stdout.write("test_logging\n")