Try to fix test__warnings

Author: slozier

tests/suite/modules/misc/test__warnings.py

@@ -6,69 +6,57 @@
 CPython's _warnings module. http://docs.python.org/library/warnings.html
 '''
 
-import unittest
 import _warnings
-from iptest import IronPythonTestCase, run_test, stderr_trapper as stderr_trapper
+from iptest import IronPythonTestCase, stderr_trapper, run_test
 
 #--GLOBALS---------------------------------------------------------------------
-EXPECTED = [] # expected output (ignoring filename, lineno, and line)
 WARN_TYPES = [Warning, UserWarning, PendingDeprecationWarning, SyntaxWarning,
               RuntimeWarning, FutureWarning, ImportWarning, UnicodeWarning,
               BytesWarning]
 
-def cleanup():
-    '''Clean up after possible incomplete test runs.'''
-    global EXPECTED
-    EXPECTED = []
-
-
-def expect(warn_type, message):
-    '''Helper for test output'''
-    for filter in _warnings.filters:
-        if filter[0] == "ignore" and issubclass(warn_type, filter[2]):
-            return
-    EXPECTED.append(": " + warn_type.__name__ + ": " + message + "\n")
-
-
 class _WarningsTest(IronPythonTestCase):
     #TODO: @skip("multiple_execute")
     def test_sanity(self):
-        global EXPECTED
-        try:
-            with stderr_trapper() as output:
-                # generate test output
-                _warnings.warn("Warning Message!")
-                expect(UserWarning, "Warning Message!")
-                for warn_type in WARN_TYPES:
-                    _warnings.warn(warn_type("Type-overriding message!"), UnicodeWarning)
-                    expect(warn_type, "Type-overriding message!")
-                    _warnings.warn("Another Warning Message!", warn_type)
-                    expect(warn_type, "Another Warning Message!")
-                    _warnings.warn_explicit("Explicit Warning!", warn_type, "nonexistent_file.py", 12)
-                    expect(warn_type, "Explicit Warning!")
-                    _warnings.warn_explicit("Explicit Warning!", warn_type, "test_python26.py", 34)
-                    expect(warn_type, "Explicit Warning!")
-                    _warnings.warn_explicit("Explicit Warning!", warn_type, "nonexistent_file.py", 56, "module.py")
-                    expect(warn_type, "Explicit Warning!")
-                    _warnings.warn_explicit("Explicit Warning!", warn_type, "test_python26.py", 78, "module.py")
-                    expect(warn_type, "Explicit Warning!")
-
-            temp_messages = output.messages
-
-            #No point in going further if the number of lines is not what we expect
-            nlines = len([x for x in temp_messages if not x.startswith("  ")])
-            self.assertEqual(nlines, len(EXPECTED))
-
-            # match lines
-            for line in temp_messages:
-                if line.startswith("  "):
-                    continue
-                temp = EXPECTED.pop(0).rstrip()
-                self.assertTrue(line.endswith(temp), str(line) + " does not end with " + temp)
-
-        finally:
-            # remove generated files
-            cleanup()
+        EXPECTED = [] # expected output (ignoring filename, lineno, and line)
+
+        def expect(warn_type, message):
+            '''Helper for test output'''
+            # unittest will reset the warning filters so the base filters do nothing
+            #for filter in _warnings.filters:
+            #    if filter[0] == "ignore" and issubclass(warn_type, filter[2]):
+            #        return
+            EXPECTED.append(": " + warn_type.__name__ + ": " + message + "\n")
+
+        with stderr_trapper() as output:
+            # generate test output
+            _warnings.warn("Warning Message!")
+            expect(UserWarning, "Warning Message!")
+            for warn_type in WARN_TYPES:
+                _warnings.warn(warn_type("Type-overriding message!"), UnicodeWarning)
+                expect(warn_type, "Type-overriding message!")
+                _warnings.warn("Another Warning Message!", warn_type)
+                expect(warn_type, "Another Warning Message!")
+                _warnings.warn_explicit("Explicit Warning!", warn_type, "nonexistent_file.py", 12)
+                expect(warn_type, "Explicit Warning!")
+                _warnings.warn_explicit("Explicit Warning!", warn_type, "test_python26.py", 34)
+                expect(warn_type, "Explicit Warning!")
+                _warnings.warn_explicit("Explicit Warning!", warn_type, "nonexistent_file.py", 56, "module.py")
+                expect(warn_type, "Explicit Warning!")
+                _warnings.warn_explicit("Explicit Warning!", warn_type, "test_python26.py", 78, "module.py")
+                expect(warn_type, "Explicit Warning!")
+
+        temp_messages = output.messages
+
+        #No point in going further if the number of lines is not what we expect
+        nlines = len([x for x in temp_messages if not x.startswith("  ")])
+        self.assertEqual(nlines, len(EXPECTED))
+
+        # match lines
+        for line in temp_messages:
+            if line.startswith("  "):
+                continue
+            temp = EXPECTED.pop(0).rstrip()
+            self.assertTrue(line.endswith(temp), str(line) + " does not end with " + temp)
 
     def test_ipy2_gh23(self):
         def test():