traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 70975 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70975 | brett.cannon | 2009-04-01 12:57:10 -0700 (Wed, 01 Apr 2009) | 4 lines

  test_logging was blindly clearing the warnings filter. This caused
  PendingDeprecationWarnings to be spewed all over by unittest.failIf*(). Fix
  moves over to using warnings.catch_warning to protect the warnings filter.
........
This commit is contained in:
Brett Cannon 2009-04-01 20:01:47 +00:00
parent 3f10a952f6
commit df8709d7b1
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Lib/test/test_logging.py
View File

@ -910,30 +910,32 @@ class EncodingTest(BaseTest):
class WarningsTest(BaseTest):
def test_warnings(self):
logging.captureWarnings(True)
warnings.filterwarnings("always", category=UserWarning)
try:
file = io.StringIO()
h = logging.StreamHandler(file)
logger = logging.getLogger("py.warnings")
logger.addHandler(h)
warnings.warn("I'm warning you...")
logger.removeHandler(h)
s = file.getvalue()
h.close()
self.assertTrue(s.find("UserWarning: I'm warning you...\n") > 0)
with warnings.catch_warnings():
warnings.filterwarnings("always", category=UserWarning)
try:
file = io.StringIO()
h = logging.StreamHandler(file)
logger = logging.getLogger("py.warnings")
logger.addHandler(h)
warnings.warn("I'm warning you...")
logger.removeHandler(h)
s = file.getvalue()
h.close()
self.assertTrue(s.find("UserWarning: I'm warning you...\n") > 0)
#See if an explicit file uses the original implementation
file = io.StringIO()
warnings.showwarning("Explicit", UserWarning, "dummy.py", 42, file,
"Dummy line")
s = file.getvalue()
file.close()
self.assertEqual(s, "dummy.py:42: UserWarning: Explicit\n Dummy line\n")
finally:
warnings.resetwarnings()
logging.captureWarnings(False)
#See if an explicit file uses the original implementation
file = io.StringIO()
warnings.showwarning("Explicit", UserWarning, "dummy.py", 42,
file, "Dummy line")
s = file.getvalue()
file.close()
self.assertEqual(s,
"dummy.py:42: UserWarning: Explicit\n Dummy line\n")
finally:
logging.captureWarnings(False)
# Set the locale to the platform-dependent default. I have no idea
# why the test does this, but in any case we save the current locale