mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Skip test_ascii_formatd if _ctypes is not available (BSD, ...).

Browse source 
Previous change was incomplete (r79334).
This commit is contained in:
Florent Xicluna 2010-03-24 17:32:58 +00:00
parent a3c39c0f72
commit 27e024023c
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/regrtest.py
View file

@ -1406,6 +1406,7 @@ _expectations = {
""", """,
'openbsd3': 'openbsd3':
""" """
test_ascii_formatd
test_bsddb test_bsddb
test_bsddb3 test_bsddb3
test_ctypes test_ctypes
@ -1424,6 +1425,7 @@ _expectations = {
""", """,
'netbsd3': 'netbsd3':
""" """
test_ascii_formatd
test_bsddb test_bsddb
test_bsddb185 test_bsddb185
test_bsddb3 test_bsddb3

21
Lib/test/test_ascii_formatd.py
View file

@ -3,20 +3,18 @@
# Test that it works, and test that it's deprecated. # Test that it works, and test that it's deprecated.
import unittest import unittest
from test.test_support import (check_warnings, run_unittest, from test.test_support import check_warnings, run_unittest, import_module
cpython_only, 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): class FormatDeprecationTests(unittest.TestCase):
@cpython_only
def test_format_deprecation(self): 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) buf = create_string_buffer(' ' * 100)
with check_warnings(('PyOS_ascii_formatd is deprecated', with check_warnings(('PyOS_ascii_formatd is deprecated',
@ -29,12 +27,7 @@ class FormatDeprecationTests(unittest.TestCase):
class FormatTests(unittest.TestCase): class FormatTests(unittest.TestCase):
# ensure that, for the restricted set of format codes, # ensure that, for the restricted set of format codes,
# %-formatting returns the same values os PyOS_ascii_formatd # %-formatting returns the same values os PyOS_ascii_formatd
@cpython_only
def test_format(self): 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) buf = create_string_buffer(' ' * 100)
tests = [ tests = [