From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 25 Jul 2011 18:58:13 +0000 (+0100)
Subject: Fixes #12637: Merged fix from 3.2 and added test.
X-Git-Tag: v3.3.0a1~1843
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8188f585b2c1d21c1b680181f38b45c4234c6865;p=thirdparty%2FPython%2Fcpython.git

Fixes #12637: Merged fix from 3.2 and added test.
---

8188f585b2c1d21c1b680181f38b45c4234c6865
diff --cc Lib/test/test_logging.py
index 5d84114f0cdb,90d293e3abe6..793d29bd4726
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@@ -2923,6 -2192,6 +2923,8 @@@ class LastResortTest(BaseTest)
          old_raise_exceptions = logging.raiseExceptions
          try:
              sys.stderr = sio = io.StringIO()
++            root.debug('This should not appear')
++            self.assertEqual(sio.getvalue(), '')
              root.warning('This is your final chance!')
              self.assertEqual(sio.getvalue(), 'This is your final chance!\n')
              #No handlers and no last resort, so 'No handlers' message