traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test_bytes: new try to fix test on '%p' formatter on Windows

This commit is contained in:
Victor Stinner 2015-10-14 15:28:59 +02:00
parent f9c9a3fedf
commit 83ff8a6832
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/test/test_bytes.py
View File

@ -839,12 +839,22 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
b'i=-123')
self.assertEqual(PyBytes_FromFormat(b'x=%x', c_int(0xabc)),
b'x=abc')
sizeof_ptr = ctypes.sizeof(c_char_p)
if os.name == 'nt':
# Windows (MSCRT)
ptr_format = '0x%0{}X'.format(2 * sizeof_ptr)
def ptr_formatter(ptr):
return (ptr_format % ptr)
else:
# UNIX (glibc)
def ptr_formatter(ptr):
return '%#x' % ptr
ptr = 0xabcdef
expected = [b'ptr=%#x' % ptr]
win_format = 'ptr=0x%0{}X'.format(2 * ctypes.sizeof(c_char_p))
expected.append((win_format % ptr).encode('ascii'))
self.assertIn(PyBytes_FromFormat(b'ptr=%p', c_char_p(ptr)),
expected)
self.assertEqual(PyBytes_FromFormat(b'ptr=%p', c_char_p(ptr)),
('ptr=' + ptr_formatter(ptr)).encode('ascii'))
self.assertEqual(PyBytes_FromFormat(b's=%s', c_char_p(b'cstr')),
b's=cstr')
@ -859,7 +869,7 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
(b'%zd', c_ssize_t, _testcapi.PY_SSIZE_T_MIN, str),
(b'%zd', c_ssize_t, _testcapi.PY_SSIZE_T_MAX, str),
(b'%zu', c_size_t, size_max, str),
(b'%p', c_char_p, size_max, lambda value: '%#x' % value),
(b'%p', c_char_p, size_max, ptr_formatter),
):
self.assertEqual(PyBytes_FromFormat(formatstr, ctypes_type(value)),
py_formatter(value).encode('ascii')),