From: Just van Rossum <just@letterror.com>
Date: Tue, 18 Nov 2003 23:00:55 +0000 (+0000)
Subject: Fix for [ 765456 ]: testAFakeZlib failed on platforms that use a
X-Git-Tag: v2.4a1~1264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59498542007400342e362f33a3e52bccb96ad04f;p=thirdparty%2FPython%2Fcpython.git

Fix for [ 765456 ]: testAFakeZlib failed on platforms that use a
statically linked zlib module, but since the problem it tests can't
exist on these systems, simply skip it then. Will backport.
---

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 86acdd20918a..21bde6830ecc 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -95,6 +95,13 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
         # (Hence the 'A' in the test method name: to make it the first
         # item in a list sorted by name, like unittest.makeSuite() does.)
         #
+        # This test fails on platforms on which the zlib module is
+        # statically linked, but the problem it tests for can't
+        # occur in that case (builtin modules are always found first),
+        # so we'll simply skip it then. Bug #765456.
+        #
+        if "zlib" in sys.builtin_module_names:
+            return
         if "zlib" in sys.modules:
             del sys.modules["zlib"]
         files = {"zlib.py": (NOW, test_src)}