From fab06b4a5ba98f63930c3dced95a14c651a836e0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Tue, 26 Sep 2023 01:16:30 +0200
Subject: [PATCH] gh-109748: Fix venv test_zippath_from_non_installed_posix()
 (GH-109872)

Fix test_zippath_from_non_installed_posix() of test_venv: don't copy
__pycache__/ sub-directories, because they can be modified by other
Python tests running in parallel.
(cherry picked from commit 25bb266fc876b344e31e0b5634a4db94912c1aba)

Co-authored-by: Victor Stinner <vstinner@python.org>
---
 Lib/test/test_venv.py                                  | 10 +++++++++-
 .../2023-09-26-00-49-18.gh-issue-109748.nxlT1i.rst     |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2023-09-26-00-49-18.gh-issue-109748.nxlT1i.rst

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index aa6a8fbf8cfd17..196ebb6ba93757 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -561,6 +561,13 @@ def test_zippath_from_non_installed_posix(self):
                                     platlibdir,
                                     stdlib_zip)
         additional_pythonpath_for_non_installed = []
+
+        # gh-109748: Don't copy __pycache__/ sub-directories, because they can
+        # be modified by other Python tests running in parallel.
+        ignored_names = {'__pycache__'}
+        def ignore_pycache(src, names):
+            return ignored_names
+
         # Copy stdlib files to the non-installed python so venv can
         # correctly calculate the prefix.
         for eachpath in sys.path:
@@ -577,7 +584,8 @@ def test_zippath_from_non_installed_posix(self):
                     if os.path.isfile(fn):
                         shutil.copy(fn, libdir)
                     elif os.path.isdir(fn):
-                        shutil.copytree(fn, os.path.join(libdir, name))
+                        shutil.copytree(fn, os.path.join(libdir, name),
+                                        ignore=ignore_pycache)
             else:
                 additional_pythonpath_for_non_installed.append(
                     eachpath)
diff --git a/Misc/NEWS.d/next/Tests/2023-09-26-00-49-18.gh-issue-109748.nxlT1i.rst b/Misc/NEWS.d/next/Tests/2023-09-26-00-49-18.gh-issue-109748.nxlT1i.rst
new file mode 100644
index 00000000000000..840366ba8d1611
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-09-26-00-49-18.gh-issue-109748.nxlT1i.rst
@@ -0,0 +1,3 @@
+Fix ``test_zippath_from_non_installed_posix()`` of test_venv: don't copy
+``__pycache__/`` sub-directories, because they can be modified by other Python
+tests running in parallel. Patch by Victor Stinner.