From 3ac866539f6b43aa61367749d7c7f2e8a71f5fa7 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 29 Mar 2014 00:07:42 -0700 Subject: [PATCH] Issue #21093: Prevent failures of ctypes test_macholib on OS X if a copy of libz exists in $HOME/lib or /usr/local/lib. --- Lib/ctypes/test/test_macholib.py | 7 +++++-- Misc/NEWS | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/test/test_macholib.py b/Lib/ctypes/test/test_macholib.py index eda846d30a..cf50f50c79 100644 --- a/Lib/ctypes/test/test_macholib.py +++ b/Lib/ctypes/test/test_macholib.py @@ -52,8 +52,11 @@ class MachOTest(unittest.TestCase): '/usr/lib/libSystem.B.dylib') result = find_lib('z') - self.assertTrue(result.startswith('/usr/lib/libz.1')) - self.assertTrue(result.endswith('.dylib')) + # Issue #21093: dyld default search path includes $HOME/lib and + # /usr/local/lib before /usr/lib, which caused test failures if + # a local copy of libz exists in one of them. Now ignore the head + # of the path. + self.assertRegexpMatches(result, r".*/lib/libz\..*.*\.dylib") self.assertEqual(find_lib('IOKit'), '/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit') diff --git a/Misc/NEWS b/Misc/NEWS index baeffbbb08..d08d0c1d6a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -336,6 +336,9 @@ Tests redirect of http://www.python.org/ to https://www.python.org: use http://www.example.com instead. +- Issue #21093: Prevent failures of ctypes test_macholib on OS X if a + copy of libz exists in $HOME/lib or /usr/local/lib. + Documentation ------------- -- 2.50.1