summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-07-23 19:39:50 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-07-23 19:39:50 (GMT)
commit88b2b45154c13947487fcdeca80f769092fb6890 (patch)
tree8f0c441b0ece13afff23b9d964fa2c63cb0a89df /Lib
parentefa9c805b1b3e1dd205592bda6913d2c499a0ccb (diff)
downloadcpython-88b2b45154c13947487fcdeca80f769092fb6890.zip
cpython-88b2b45154c13947487fcdeca80f769092fb6890.tar.gz
cpython-88b2b45154c13947487fcdeca80f769092fb6890.tar.bz2
Issue #19493: Fix two uses of ctypes.test.requires (it's not a decorator)
and skip test_win32.FunctionCallTestCase.test_SEH when Python was compiled in debug configuration or by a non-MSC compiler.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ctypes/test/test_python_api.py2
-rw-r--r--Lib/ctypes/test/test_win32.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/ctypes/test/test_python_api.py b/Lib/ctypes/test/test_python_api.py
index 8aae46f..0bd2f4c 100644
--- a/Lib/ctypes/test/test_python_api.py
+++ b/Lib/ctypes/test/test_python_api.py
@@ -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)
diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py
index b47a61a..fcd2163 100644
--- a/Lib/ctypes/test/test_win32.py
+++ b/Lib/ctypes/test/test_win32.py
@@ -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.