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

gh-94808: Fix regex on exotic platforms (#98036)

Browse source 
The test failed on a buildbot because the pointer was only 7 hex characters. To be safe,
I bumped it down to 3: 4 in case we have 32-bit platforms, and 3 in case the pointer is very small.
This commit is contained in:
Jelle Zijlstra 2022-10-07 15:39:53 -07:00 • committed by GitHub
parent cb4615fd43
commit a54a69989e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_unicode.py
View file

@ -2811,7 +2811,7 @@ class CAPITest(unittest.TestCase):
# We cannot test the exact result, # We cannot test the exact result,
# because it returns a hex representation of a C pointer, # because it returns a hex representation of a C pointer,
# which is going to be different each time. But, we can test the format. # which is going to be different each time. But, we can test the format.
p_format_regex = r'^0x[a-zA-Z0-9]{8,}$' p_format_regex = r'^0x[a-zA-Z0-9]{3,}$'
p_format1 = PyUnicode_FromFormat(b'%p', 'abc') p_format1 = PyUnicode_FromFormat(b'%p', 'abc')
self.assertIsInstance(p_format1, str) self.assertIsInstance(p_format1, str)
self.assertRegex(p_format1, p_format_regex) self.assertRegex(p_format1, p_format_regex)
@ -2819,7 +2819,7 @@ class CAPITest(unittest.TestCase):
p_format2 = PyUnicode_FromFormat(b'%p %p', '123456', b'xyz') p_format2 = PyUnicode_FromFormat(b'%p %p', '123456', b'xyz')
self.assertIsInstance(p_format2, str) self.assertIsInstance(p_format2, str)
self.assertRegex(p_format2, self.assertRegex(p_format2,
r'0x[a-zA-Z0-9]{8,} 0x[a-zA-Z0-9]{8,}') r'0x[a-zA-Z0-9]{3,} 0x[a-zA-Z0-9]{3,}')
# Extra args are ignored: # Extra args are ignored:
p_format3 = PyUnicode_FromFormat(b'%p', '123456', None, b'xyz') p_format3 = PyUnicode_FromFormat(b'%p', '123456', None, b'xyz')

1
Makefile.pre.in
View file

@ -2038,6 +2038,7 @@ TESTSUBDIRS= distutils/tests \
test/test_zoneinfo test/test_zoneinfo/data \ test/test_zoneinfo test/test_zoneinfo/data \
test/test_unittest test/test_unittest/testmock \ test/test_unittest test/test_unittest/testmock \
test/tracedmodules \ test/tracedmodules \
test/typinganndata \
test/xmltestdata test/xmltestdata/c14n-20 \ test/xmltestdata test/xmltestdata/c14n-20 \
test/ziptestdata test/ziptestdata