8000 gh-126742: avoid checking for library filename in `dlerror()` error messages by picnixz · Pull Request #128034 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-126742: avoid checking for library filename in dlerror() error messages #128034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 18, 2024
Merged

gh-126742: avoid checking for library filename in dlerror() error messages #128034

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d062bd7
fix tests on ppc machines
picnixz Dec 17, 2024
a1c32ce
remove un-necessary check
picnixz Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix tests on ppc machines
  • Loading branch information
@picnixz
picnixz committed Dec 17, 2024
commit d062bd7d37158ee6e6d9a286b54a92e368fe1bc1
29 changes: 20 additions & 9 deletions Lib/test/test_ctypes/test_dlerror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
impor 8000 t _ctypes
import os
import platform
import re
import sys
import test.support
import unittest
Expand Down Expand Up @@ -133,24 +134,36 @@ def configure_locales(func):
@classmethod
def setUpClass(cls):
cls.libc_filename = find_library("c")
if cls.libc_filename is None:
raise unittest.SkipTest('cannot find libc')

def check_filename_in_dlerror(self, error_message):
if not sys.platform.startswith('linux'):
# On macOS, the filename is not reported by dlerror().
return

if not re.match(r'(i[3-6]86|x86_64)$', platform.machine()):
# On some architectures, the libc file is detected
# to be 'libc.so.6' but is incorrectly reported by
# dlerror() as libc-X.Y.so.
self.skipTest('do not search for filename '
'in dlerror() error message')

self.assertIn(self.libc_filename, error_message)

@configure_locales
def test_localized_error_from_dll(self):
dll = CDLL(self.libc_filename)
with self.assertRaises(AttributeError) as cm:
dll.this_name_does_not_exist
if sys.platform.startswith('linux'):
# On macOS, the filename is not reported by dlerror().
self.assertIn(self.libc_filename, str(cm.exception))
self.check_filename_in_dlerror(str(cm.exception))

@configure_locales
def test_localized_error_in_dll(self):
dll = CDLL(self.libc_filename)
with self.assertRaises(ValueError) as cm:
c_int.in_dll(dll, 'this_name_does_not_exist')
if sys.platform.startswith('linux'):
# On macOS, the filename is not reported by dlerror().
self.assertIn(self.libc_filename, str(cm.exception))
self.check_filename_in_dlerror(str(cm.exception))

@unittest.skipUnless(hasattr(_ctypes, 'dlopen'),
'test requires _ctypes.dlopen()')
Expand All @@ -174,9 +187,7 @@ def test_localized_error_dlsym(self):
dll = _ctypes.dlopen(self.libc_filename)
with self.assertRaises(OSError) as cm:
_ctypes.dlsym(dll, 'this_name_does_not_exist')
if sys.platform.startswith('linux'):
# On macOS, the filename is not reported by dlerror().
self.assertIn(self.libc_filename, str(cm.exception))
self.check_filename_in_dlerror(str(cm.exception))


if __name__ == "__main__":
Expand Down
Loading
0