Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix test_from_dll* in test_returnfuncptrs.py.

This commit is contained in:
Serhiy Storchaka 2013-02-07 15:00:02 +02:00
parent b36f7d7b7e f5d245a0a0
commit 73cfd79533
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/ctypes/test/test_returnfuncptrs.py
View File

@ -34,31 +34,30 @@ class ReturnFuncPtrTestCase(unittest.TestCase):
self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0)
self.assertRaises(TypeError, strchr, b"abcdef") self.assertRaises(TypeError, strchr, b"abcdef")
@unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows')
def test_from_dll(self): def test_from_dll(self):
dll = CDLL(_ctypes_test.__file__) dll = CDLL(_ctypes_test.__file__)
# _CFuncPtr instances are now callable with a tuple argument # _CFuncPtr instances are now callable with a tuple argument
# which denotes a function name and a dll: # which denotes a function name and a dll:
strchr = CFUNCTYPE(c_char_p, c_char_p, c_char)(("strchr", dll)) strchr = CFUNCTYPE(c_char_p, c_char_p, c_char)(("my_strchr", dll))
self.assertTrue(strchr(b"abcdef", b"b"), "bcdef") self.assertTrue(strchr(b"abcdef", b"b"), "bcdef")
self.assertEqual(strchr(b"abcdef", b"x"), None) self.assertEqual(strchr(b"abcdef", b"x"), None)
self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0)
self.assertRaises(TypeError, strchr, b"abcdef") self.assertRaises(TypeError, strchr, b"abcdef")
@unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows')
# Issue 6083: Reference counting bug # Issue 6083: Reference counting bug
def test_from_dll_refcount(self): def test_from_dll_refcount(self):
class BadSequence(tuple): class BadSequence(tuple):
def __getitem__(self, key): def __getitem__(self, key):
if key == 0: if key == 0:
return "strchr" return "my_strchr"
if key == 1: if key == 1:
return CDLL(_ctypes_test.__file__) return CDLL(_ctypes_test.__file__)
raise IndexError raise IndexError
# _CFuncPtr instances are now callable with a tuple argument # _CFuncPtr instances are now callable with a tuple argument
# which denotes a function name and a dll: # which denotes a function name and a dll:
strchr = CFUNCTYPE(c_char_p, c_char_p, c_char)(BadSequence(("strchr", CDLL(_ctypes_test.__file__)))) strchr = CFUNCTYPE(c_char_p, c_char_p, c_char)(
BadSequence(("my_strchr", CDLL(_ctypes_test.__file__))))
self.assertTrue(strchr(b"abcdef", b"b"), "bcdef") self.assertTrue(strchr(b"abcdef", b"b"), "bcdef")
self.assertEqual(strchr(b"abcdef", b"x"), None) self.assertEqual(strchr(b"abcdef", b"x"), None)
self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0)