[Python-checkins] r79378 - in python/trunk/Lib/test: regrtest.py test_ascii_formatd.py

[florent.xicluna]

Author: florent.xicluna
Date: Wed Mar 24 18:32:58 2010
New Revision: 79378

Log:
Skip test_ascii_formatd if _ctypes is not available (BSD, ...).
Previous change was incomplete (r79334).


Modified:
   python/trunk/Lib/test/regrtest.py
   python/trunk/Lib/test/test_ascii_formatd.py

Modified: python/trunk/Lib/test/regrtest.py
==============================================================================
--- python/trunk/Lib/test/regrtest.py	(original)
+++ python/trunk/Lib/test/regrtest.py	Wed Mar 24 18:32:58 2010
@@ -1406,6 +1406,7 @@
         """,
     'openbsd3':
         """
+        test_ascii_formatd
         test_bsddb
         test_bsddb3
         test_ctypes
@@ -1424,6 +1425,7 @@
         """,
     'netbsd3':
         """
+        test_ascii_formatd
         test_bsddb
         test_bsddb185
         test_bsddb3

Modified: python/trunk/Lib/test/test_ascii_formatd.py
==============================================================================
--- python/trunk/Lib/test/test_ascii_formatd.py	(original)
+++ python/trunk/Lib/test/test_ascii_formatd.py	Wed Mar 24 18:32:58 2010
@@ -3,20 +3,18 @@
 # Test that it works, and test that it's deprecated.
 
 import unittest
-from test.test_support import (check_warnings, run_unittest,
-                               cpython_only, import_module)
+from test.test_support import check_warnings, run_unittest, import_module
+
+# Skip tests if _ctypes module does not exist
+import_module('_ctypes')
+
+from ctypes import pythonapi, create_string_buffer, sizeof, byref, c_double
+PyOS_ascii_formatd = pythonapi.PyOS_ascii_formatd
 
 
 class FormatDeprecationTests(unittest.TestCase):
 
-    @cpython_only
     def test_format_deprecation(self):
-        # skip if _ctypes is not available
-        import_module('_ctypes')
-        # delay importing ctypes until we know we're in CPython
-        from ctypes import (pythonapi, create_string_buffer, sizeof, byref,
-                            c_double)
-        PyOS_ascii_formatd = pythonapi.PyOS_ascii_formatd
         buf = create_string_buffer(' ' * 100)
 
         with check_warnings(('PyOS_ascii_formatd is deprecated',
@@ -29,12 +27,7 @@
 class FormatTests(unittest.TestCase):
     # ensure that, for the restricted set of format codes,
     # %-formatting returns the same values os PyOS_ascii_formatd
-    @cpython_only
     def test_format(self):
-        # delay importing ctypes until we know we're in CPython
-        from ctypes import (pythonapi, create_string_buffer, sizeof, byref,
-                            c_double)
-        PyOS_ascii_formatd = pythonapi.PyOS_ascii_formatd
         buf = create_string_buffer(' ' * 100)
 
         tests = [