Fix tests so they pass in -R mode

This commit is contained in:
Neal Norwitz 2006-04-09 08:36:46 +00:00
parent aa34b6c2e3
commit ce4a9c9019
3 changed files with 18 additions and 7 deletions

View File

@ -42,11 +42,13 @@ Signals = getcontext().flags.keys()
# Tests are built around these assumed context defaults. # Tests are built around these assumed context defaults.
# test_main() restores the original context. # test_main() restores the original context.
ORIGINAL_CONTEXT = getcontext().copy() def init():
DefaultContext.prec = 9 global ORIGINAL_CONTEXT
DefaultContext.rounding = ROUND_HALF_EVEN ORIGINAL_CONTEXT = getcontext().copy()
DefaultContext.traps = dict.fromkeys(Signals, 0) DefaultContext.prec = 9
setcontext(DefaultContext) DefaultContext.rounding = ROUND_HALF_EVEN
DefaultContext.traps = dict.fromkeys(Signals, 0)
setcontext(DefaultContext)
TESTDATADIR = 'decimaltestdata' TESTDATADIR = 'decimaltestdata'
if __name__ == '__main__': if __name__ == '__main__':
@ -1069,6 +1071,7 @@ def test_main(arith=False, verbose=None):
is enabled in regrtest.py is enabled in regrtest.py
""" """
init()
global TEST_ALL global TEST_ALL
TEST_ALL = arith or is_resource_enabled('decimal') TEST_ALL = arith or is_resource_enabled('decimal')

View File

@ -152,6 +152,10 @@ class TestSFpatches(unittest.TestCase):
difflib.SequenceMatcher(None, old, new).get_opcodes() difflib.SequenceMatcher(None, old, new).get_opcodes()
Doctests = doctest.DocTestSuite(difflib) def test_main():
difflib.HtmlDiff._default_prefix = 0
Doctests = doctest.DocTestSuite(difflib)
run_unittest(TestSFpatches, TestSFbugs, Doctests)
run_unittest(TestSFpatches, TestSFbugs, Doctests) if __name__ == '__main__':
test_main()

View File

@ -84,5 +84,9 @@ class TestModule(unittest.TestCase):
def test_main(verbose=None): def test_main(verbose=None):
test_support.run_unittest(TestModule) test_support.run_unittest(TestModule)
# Obscure hack so that this test passes after reloads (regrtest -R).
if '__warningregistry__' in globals():
del globals()['__warningregistry__']
if __name__ == "__main__": if __name__ == "__main__":
test_main(verbose=True) test_main(verbose=True)