Merged revisions 70979 via svnmerge from

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

........
  r70979 | brett.cannon | 2009-04-01 13:25:48 -0700 (Wed, 01 Apr 2009) | 3 lines

  test_warnings ironically had a single test that was not protecting the warnings
  filter and was resetting it.
........
This commit is contained in:
Brett Cannon 2009-04-01 20:27:29 +00:00
parent b3af08f84c
commit fcc052763e
1 changed files with 8 additions and 8 deletions

View File

@ -470,14 +470,14 @@ class _WarningsTests(BaseTest):
self.failUnless(text in result)
def test_showwarning_not_callable(self):
self.module.filterwarnings("always", category=UserWarning)
old_showwarning = self.module.showwarning
self.module.showwarning = 23
try:
self.assertRaises(TypeError, self.module.warn, "Warning!")
finally:
self.module.showwarning = old_showwarning
self.module.resetwarnings()
with original_warnings.catch_warnings(module=self.module):
self.module.filterwarnings("always", category=UserWarning)
old_showwarning = self.module.showwarning
self.module.showwarning = 23
try:
self.assertRaises(TypeError, self.module.warn, "Warning!")
finally:
self.module.showwarning = old_showwarning
def test_show_warning_output(self):
# With showarning() missing, make sure that output is okay.