Make test_structmembers pass when run with regrtests's -R flag.

This commit is contained in:
Collin Winter 2007-08-24 21:09:42 +00:00
parent c325556505
commit 68f525fdc8
1 changed files with 9 additions and 6 deletions

View File

@ -5,7 +5,7 @@ from _testcapi import test_structmembersType, \
LONG_MAX, LONG_MIN, ULONG_MAX, \ LONG_MAX, LONG_MIN, ULONG_MAX, \
LLONG_MAX, LLONG_MIN, ULLONG_MAX LLONG_MAX, LLONG_MIN, ULLONG_MAX
import warnings, exceptions, unittest import warnings, exceptions, unittest, sys
from test import test_support from test import test_support
ts=test_structmembersType(1,2,3,4,5,6,7,8,9.99999,10.1010101010) ts=test_structmembersType(1,2,3,4,5,6,7,8,9.99999,10.1010101010)
@ -59,7 +59,7 @@ class ReadWriteTests(unittest.TestCase):
class TestWarnings(unittest.TestCase): class TestWarnings(unittest.TestCase):
def has_warned(self, w): def has_warned(self, w):
self.assert_(w.category is RuntimeWarning) self.assertEqual(w.category, RuntimeWarning)
def test_byte_max(self): def test_byte_max(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
@ -94,10 +94,13 @@ class TestWarnings(unittest.TestCase):
def test_main(verbose=None): def test_main(verbose=None):
test_support.run_unittest( # Obscure hack so that this test passes after reloads or repeated calls
ReadWriteTests, # to test_main (regrtest -R).
TestWarnings if '__warningregistry__' in globals():
) del globals()['__warningregistry__']
if hasattr(sys, '__warningregistry__'):
del sys.__warningregistry__
test_support.run_unittest(__name__)
if __name__ == "__main__": if __name__ == "__main__":
test_main(verbose=True) test_main(verbose=True)