Merged revisions 79030-79032 via svnmerge from

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

........
  r79030 | florent.xicluna | 2010-03-17 20:05:04 +0100 (mer, 17 mar 2010) | 2 lines

  Cleanup in test_import and test_coding.
........
  r79031 | florent.xicluna | 2010-03-17 20:15:56 +0100 (mer, 17 mar 2010) | 2 lines

  Cleanup some test cases using check_warnings and check_py3k_warnings.
........
  r79032 | florent.xicluna | 2010-03-17 21:05:11 +0100 (mer, 17 mar 2010) | 2 lines

  Fix and check cgi module deprecation warnings.  Revert an unwanted rename in test_import.
........
This commit is contained in:
Florent Xicluna 2010-03-17 20:29:51 +00:00
parent a85c3bd17d
commit 8fbddf15ea
6 changed files with 100 additions and 126 deletions

View file

@ -103,39 +103,30 @@ class ReadWriteTests(unittest.TestCase):
class TestWarnings(unittest.TestCase):
def has_warned(self, w):
self.assertEqual(w.category, RuntimeWarning)
def test_byte_max(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_BYTE = CHAR_MAX+1
self.has_warned(w)
def test_byte_min(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_BYTE = CHAR_MIN-1
self.has_warned(w)
def test_ubyte_max(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_UBYTE = UCHAR_MAX+1
self.has_warned(w)
def test_short_max(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_SHORT = SHRT_MAX+1
self.has_warned(w)
def test_short_min(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_SHORT = SHRT_MIN-1
self.has_warned(w)
def test_ushort_max(self):
with support.check_warnings() as w:
with support.check_warnings(('', RuntimeWarning)):
ts.T_USHORT = USHRT_MAX+1
self.has_warned(w)
def test_main(verbose=None):