From 730b07e722f6adbf28b95b08d8339af32cceb65b Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 15:18:45 +0800 Subject: [PATCH] gh-123930: Correct test of attribute failure to account for iOS (GH-125959) Update a test of importing attributes from binary modules to account for iOS conditions. (cherry picked from commit 75401febc91a449cc4f4391d663e9a96ce91bb6c) Co-authored-by: Russell Keith-Magee --- Lib/test/test_import/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index fac5265f1758da..3f71a2bf3d9c39 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -389,10 +389,14 @@ def test_from_import_missing_attr_has_name_and_so_path(self): from _testcapi import i_dont_exist self.assertEqual(cm.exception.name, '_testcapi') if hasattr(_testcapi, "__file__"): - self.assertEqual(cm.exception.path, _testcapi.__file__) + # The path on the exception is strictly the spec origin, not the + # module's __file__. For most cases, these are the same; but on + # iOS, the Framework relocation process results in the exception + # being raised from the spec location. + self.assertEqual(cm.exception.path, _testcapi.__spec__.origin) self.assertRegex( str(cm.exception), - r"cannot import name 'i_dont_exist' from '_testcapi' \(.*\.(so|fwork|pyd)\)" + r"cannot import name 'i_dont_exist' from '_testcapi' \(.*(\.(so|pyd))?\)" ) else: self.assertEqual(