diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-02-07 13:00:02 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-02-07 13:00:02 (GMT) |
| commit | 73cfd79533bd821c5a80fd4165bea05ab6829008 (patch) | |
| tree | e9f1ad814d5c60620da663f5be17c5dfb2e8d2ce | |
| parent | b36f7d7b7e6e1c7d98592d25ebf3dd3f6945e60f (diff) | |
| parent | f5d245a0a0d8c00ca986bd84e54b940ab0eb75cf (diff) | |
| download | cpython-73cfd79533bd821c5a80fd4165bea05ab6829008.zip cpython-73cfd79533bd821c5a80fd4165bea05ab6829008.tar.gz cpython-73cfd79533bd821c5a80fd4165bea05ab6829008.tar.bz2 | |
Fix test_from_dll* in test_returnfuncptrs.py.
| -rw-r--r-- | Lib/ctypes/test/test_returnfuncptrs.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/ctypes/test/test_returnfuncptrs.py b/Lib/ctypes/test/test_returnfuncptrs.py index 6b2d047..93eba6b 100644 --- a/Lib/ctypes/test/test_returnfuncptrs.py +++ b/Lib/ctypes/test/test_returnfuncptrs.py @@ -34,31 +34,30 @@ class ReturnFuncPtrTestCase(unittest.TestCase): self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) self.assertRaises(TypeError, strchr, b"abcdef") - @unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows') def test_from_dll(self): dll = CDLL(_ctypes_test.__file__) # _CFuncPtr instances are now callable with a tuple argument # 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.assertEqual(strchr(b"abcdef", b"x"), None) self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) self.assertRaises(TypeError, strchr, b"abcdef") - @unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows') # Issue 6083: Reference counting bug def test_from_dll_refcount(self): class BadSequence(tuple): def __getitem__(self, key): if key == 0: - return "strchr" + return "my_strchr" if key == 1: return CDLL(_ctypes_test.__file__) raise IndexError # _CFuncPtr instances are now callable with a tuple argument # 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.assertEqual(strchr(b"abcdef", b"x"), None) self.assertRaises(ArgumentError, strchr, b"abcdef", 3.0) |