]> granicus.if.org Git - python/commitdiff
Issue #19493: Fix two uses of ctypes.test.requires (it's not a decorator)
authorZachary Ware <zachary.ware@gmail.com>
Wed, 23 Jul 2014 19:39:50 +0000 (14:39 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 23 Jul 2014 19:39:50 +0000 (14:39 -0500)
and skip test_win32.FunctionCallTestCase.test_SEH when Python was compiled
in debug configuration or by a non-MSC compiler.

Lib/ctypes/test/test_python_api.py
Lib/ctypes/test/test_win32.py

index 8aae46f92736555984830dcf144fb9e42cbf164e..0bd2f4cd5b5e117ea1f555a39095b2508fb867ca 100644 (file)
@@ -42,9 +42,9 @@ class PythonAPITestCase(unittest.TestCase):
     # This test is unreliable, because it is possible that code in
     # unittest changes the refcount of the '42' integer.  So, it
     # is disabled by default.
-    @requires("refcount")
     @support.refcount_test
     def test_PyLong_Long(self):
+        requires("refcount")
         ref42 = grc(42)
         pythonapi.PyLong_FromLong.restype = py_object
         self.assertEqual(pythonapi.PyLong_FromLong(42), 42)
index b47a61ac2d9c66834f79700c5b13ca3211501ec3..fcd216312a0e5a313586abb4f9e573bc511ead07 100644 (file)
@@ -38,8 +38,11 @@ class WindowsTestCase(unittest.TestCase):
 
 @unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 class FunctionCallTestCase(unittest.TestCase):
-    @requires("SEH")
+    @unittest.skipUnless('MSC' in sys.version, "SEH only supported by MSC")
+    @unittest.skipIf(sys.executable.endswith('_d.exe'),
+                     "SEH not enabled in debug builds")
     def test_SEH(self):
+        requires("SEH")
         # Call functions with invalid arguments, and make sure
         # that access violations are trapped and raise an
         # exception.