[Python-checkins] cpython (merge 3.2 -> 3.3): Fix test_from_dll* in test_returnfuncptrs.py.
serhiy.storchaka
python-checkins at python.org
Thu Feb 7 14:03:02 CET 2013
http://hg.python.org/cpython/rev/e49cc1585966
changeset: 82041:e49cc1585966
branch: 3.3
parent: 82036:e15d2ad42d93
parent: 82040:ec70abe8c886
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Feb 07 14:59:25 2013 +0200
summary:
Fix test_from_dll* in test_returnfuncptrs.py.
files:
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
--- a/Lib/ctypes/test/test_returnfuncptrs.py
+++ b/Lib/ctypes/test/test_returnfuncptrs.py
@@ -34,31 +34,30 @@
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)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list