[Python-checkins] cpython (2.7): Fix test_from_dll* in test_returnfuncptrs.py.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/8fb98fb758e8
changeset:   82039:8fb98fb758e8
branch:      2.7
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Feb 07 14:57:53 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
@@ -32,31 +32,30 @@
         self.assertRaises(ArgumentError, strchr, "abcdef", 3)
         self.assertRaises(TypeError, strchr, "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")
 
     # Issue 6083: Reference counting bug
-    @unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows')
     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