[Python-checkins] cpython (merge 3.3 -> default): Fix test_from_dll* in test_returnfuncptrs.py.

Thu Feb 7 14:03:03 CET 2013

http://hg.python.org/cpython/rev/3236ebe7dd82
changeset: 82042:3236ebe7dd82
parent: 82037:b79df3e8a9a0
parent: 82041:e49cc1585966
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Feb 07 15:00:02 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
