Backport of 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.

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 86acdd20918a669a54adb9393f2a44f24884e649..21bde6830ecc0ac796a41d99a831df8b9d81df0d 100644 (file)
--- 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)}