https://github.com/python/cpython/commit/335e24fb0a5805ac1ecdbc01e0331b38fc33849d
commit: 335e24fb0a5805ac1ecdbc01e0331b38fc33849d
branch: main
author: Bénédikt Tran <[email protected]>
committer: vstinner <[email protected]>
date: 2024-12-18T09:25:42+01:00
summary:
gh-126742: Avoid checking for library filename in test_ctypes (#128034)
Avoid checking for library filename in `dlerror()` error messages of
test_ctypes.
files:
M Lib/test/test_ctypes/test_dlerror.py
diff --git a/Lib/test/test_ctypes/test_dlerror.py
b/Lib/test/test_ctypes/test_dlerror.py
index c3c34d43481d36..6bf492399cbf95 100644
--- a/Lib/test/test_ctypes/test_dlerror.py
+++ b/Lib/test/test_ctypes/test_dlerror.py
@@ -133,24 +133,20 @@ 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')
@configure_locales
def test_localized_error_from_dll(self):
dll = CDLL(self.libc_filename)
- with self.assertRaises(AttributeError) as cm:
+ with self.assertRaises(AttributeError):
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))
@configure_locales
def test_localized_error_in_dll(self):
dll = CDLL(self.libc_filename)
- with self.assertRaises(ValueError) as cm:
+ with self.assertRaises(ValueError):
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))
@unittest.skipUnless(hasattr(_ctypes, 'dlopen'),
'test requires _ctypes.dlopen()')
@@ -172,11 +168,8 @@ def test_localized_error_dlopen(self):
@configure_locales
def test_localized_error_dlsym(self):
dll = _ctypes.dlopen(self.libc_filename)
- with self.assertRaises(OSError) as cm:
+ with self.assertRaises(OSError):
_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))
if __name__ == "__main__":
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
