From 890ef1b035457fe5d0b0faf27a703c74c33e0141 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Sat, 4 Nov 2023 12:57:53 +0300
Subject: gh-108303: Move `zip` and `tar` archives to
 `Lib/test/archivetestdata` (#111549)

---
 Lib/test/archivetestdata/README.md                 |  36 +++++++++++++++++++++
 Lib/test/archivetestdata/exe_with_z64              | Bin 0 -> 978 bytes
 Lib/test/archivetestdata/exe_with_zip              | Bin 0 -> 990 bytes
 Lib/test/archivetestdata/header.sh                 |  24 ++++++++++++++
 Lib/test/archivetestdata/recursion.tar             | Bin 0 -> 516 bytes
 .../archivetestdata/testdata_module_inside_zip.py  |   2 ++
 Lib/test/archivetestdata/testtar.tar               | Bin 0 -> 435200 bytes
 Lib/test/archivetestdata/testtar.tar.xz            | Bin 0 -> 172 bytes
 Lib/test/archivetestdata/zip_cp437_header.zip      | Bin 0 -> 270 bytes
 Lib/test/archivetestdata/zipdir.zip                | Bin 0 -> 374 bytes
 Lib/test/recursion.tar                             | Bin 516 -> 0 bytes
 Lib/test/test_contextlib.py                        |   2 +-
 Lib/test/test_tarfile.py                           |  12 +++----
 Lib/test/test_zipfile/test_core.py                 |  14 ++++----
 Lib/test/testtar.tar                               | Bin 435200 -> 0 bytes
 Lib/test/testtar.tar.xz                            | Bin 172 -> 0 bytes
 Lib/test/zip_cp437_header.zip                      | Bin 270 -> 0 bytes
 Lib/test/zipdir.zip                                | Bin 374 -> 0 bytes
 Lib/test/ziptestdata/README.md                     |  35 --------------------
 Lib/test/ziptestdata/exe_with_z64                  | Bin 978 -> 0 bytes
 Lib/test/ziptestdata/exe_with_zip                  | Bin 990 -> 0 bytes
 Lib/test/ziptestdata/header.sh                     |  24 --------------
 Lib/test/ziptestdata/testdata_module_inside_zip.py |   2 --
 Makefile.pre.in                                    |   4 +--
 24 files changed, 78 insertions(+), 77 deletions(-)
 create mode 100644 Lib/test/archivetestdata/README.md
 create mode 100755 Lib/test/archivetestdata/exe_with_z64
 create mode 100755 Lib/test/archivetestdata/exe_with_zip
 create mode 100755 Lib/test/archivetestdata/header.sh
 create mode 100644 Lib/test/archivetestdata/recursion.tar
 create mode 100644 Lib/test/archivetestdata/testdata_module_inside_zip.py
 create mode 100644 Lib/test/archivetestdata/testtar.tar
 create mode 100644 Lib/test/archivetestdata/testtar.tar.xz
 create mode 100644 Lib/test/archivetestdata/zip_cp437_header.zip
 create mode 100644 Lib/test/archivetestdata/zipdir.zip
 delete mode 100644 Lib/test/recursion.tar
 delete mode 100644 Lib/test/testtar.tar
 delete mode 100644 Lib/test/testtar.tar.xz
 delete mode 100644 Lib/test/zip_cp437_header.zip
 delete mode 100644 Lib/test/zipdir.zip
 delete mode 100644 Lib/test/ziptestdata/README.md
 delete mode 100755 Lib/test/ziptestdata/exe_with_z64
 delete mode 100755 Lib/test/ziptestdata/exe_with_zip
 delete mode 100755 Lib/test/ziptestdata/header.sh
 delete mode 100644 Lib/test/ziptestdata/testdata_module_inside_zip.py

diff --git a/Lib/test/archivetestdata/README.md b/Lib/test/archivetestdata/README.md
new file mode 100644
index 0000000..7b555fa
--- /dev/null
+++ b/Lib/test/archivetestdata/README.md
@@ -0,0 +1,36 @@
+# Test data for `test_zipfile`, `test_tarfile` (and even some others)
+
+## `test_zipfile`
+
+The test executables in this directory are created manually from `header.sh` and
+the `testdata_module_inside_zip.py` file.  You must have Info-ZIP's zip utility
+installed (`apt install zip` on Debian).
+
+### Purpose of `exe_with_zip` and `exe_with_z64`
+
+These are used to test executable files with an appended zipfile, in a scenario
+where the executable is _not_ a Python interpreter itself so our automatic
+zipimport machinery (that'd look for `__main__.py`) is not being used.
+
+### Updating the test executables
+
+If you update header.sh or the testdata_module_inside_zip.py file, rerun the
+commands below.  These are expected to be rarely changed, if ever.
+
+#### Standard old format (2.0) zip file
+
+```
+zip -0 zip2.zip testdata_module_inside_zip.py
+cat header.sh zip2.zip >exe_with_zip
+rm zip2.zip
+```
+
+#### Modern format (4.5) zip64 file
+
+Redirecting from stdin forces Info-ZIP's zip tool to create a zip64.
+
+```
+zip -0 <testdata_module_inside_zip.py >zip64.zip
+cat header.sh zip64.zip >exe_with_z64
+rm zip64.zip
+```
diff --git a/Lib/test/archivetestdata/exe_with_z64 b/Lib/test/archivetestdata/exe_with_z64
new file mode 100755
index 0000000..82b03cf
Binary files /dev/null and b/Lib/test/archivetestdata/exe_with_z64 differ
diff --git a/Lib/test/archivetestdata/exe_with_zip b/Lib/test/archivetestdata/exe_with_zip
new file mode 100755
index 0000000..c833cdf
Binary files /dev/null and b/Lib/test/archivetestdata/exe_with_zip differ
diff --git a/Lib/test/archivetestdata/header.sh b/Lib/test/archivetestdata/header.sh
new file mode 100755
index 0000000..52dc91a
--- /dev/null
+++ b/Lib/test/archivetestdata/header.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+INTERPRETER_UNDER_TEST="$1"
+if [[ ! -x "${INTERPRETER_UNDER_TEST}" ]]; then
+    echo "Interpreter must be the command line argument."
+    exit 4
+fi
+EXECUTABLE="$0" exec "${INTERPRETER_UNDER_TEST}" -E - <<END_OF_PYTHON
+import os
+import zipfile
+
+namespace = {}
+
+filename = os.environ['EXECUTABLE']
+print(f'Opening {filename} as a zipfile.')
+with zipfile.ZipFile(filename, mode='r') as exe_zip:
+  for file_info in exe_zip.infolist():
+    data = exe_zip.read(file_info)
+    exec(data, namespace, namespace)
+    break  # Only use the first file in the archive.
+
+print('Favorite number in executable:', namespace["FAVORITE_NUMBER"])
+
+### Archive contents will be appended after this file. ###
+END_OF_PYTHON
diff --git a/Lib/test/archivetestdata/recursion.tar b/Lib/test/archivetestdata/recursion.tar
new file mode 100644
index 0000000..b823725
Binary files /dev/null and b/Lib/test/archivetestdata/recursion.tar differ
diff --git a/Lib/test/archivetestdata/testdata_module_inside_zip.py b/Lib/test/archivetestdata/testdata_module_inside_zip.py
new file mode 100644
index 0000000..6f8dcd6
--- /dev/null
+++ b/Lib/test/archivetestdata/testdata_module_inside_zip.py
@@ -0,0 +1,2 @@
+# Test data file to be stored within a zip file.
+FAVORITE_NUMBER = 5
diff --git a/Lib/test/archivetestdata/testtar.tar b/Lib/test/archivetestdata/testtar.tar
new file mode 100644
index 0000000..bb93453
Binary files /dev/null and b/Lib/test/archivetestdata/testtar.tar differ
diff --git a/Lib/test/archivetestdata/testtar.tar.xz b/Lib/test/archivetestdata/testtar.tar.xz
new file mode 100644
index 0000000..512fa14
Binary files /dev/null and b/Lib/test/archivetestdata/testtar.tar.xz differ
diff --git a/Lib/test/archivetestdata/zip_cp437_header.zip b/Lib/test/archivetestdata/zip_cp437_header.zip
new file mode 100644
index 0000000..f7c6cf1
Binary files /dev/null and b/Lib/test/archivetestdata/zip_cp437_header.zip differ
diff --git a/Lib/test/archivetestdata/zipdir.zip b/Lib/test/archivetestdata/zipdir.zip
new file mode 100644
index 0000000..ac21d7a
Binary files /dev/null and b/Lib/test/archivetestdata/zipdir.zip differ
diff --git a/Lib/test/recursion.tar b/Lib/test/recursion.tar
deleted file mode 100644
index b823725..0000000
Binary files a/Lib/test/recursion.tar and /dev/null differ
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index 3dad256..e32a091 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -1318,7 +1318,7 @@ class TestChdir(unittest.TestCase):
     def test_reentrant(self):
         old_cwd = os.getcwd()
         target1 = self.make_relative_path('data')
-        target2 = self.make_relative_path('ziptestdata')
+        target2 = self.make_relative_path('archivetestdata')
         self.assertNotIn(old_cwd, (target1, target2))
         chdir1, chdir2 = chdir(target1), chdir(target2)
 
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index cc26da0..761560b 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -43,7 +43,7 @@ def sha256sum(data):
 
 TEMPDIR = os.path.abspath(os_helper.TESTFN) + "-tardir"
 tarextdir = TEMPDIR + '-extract-test'
-tarname = support.findfile("testtar.tar")
+tarname = support.findfile("testtar.tar", subdir="archivetestdata")
 gzipname = os.path.join(TEMPDIR, "testtar.tar.gz")
 bz2name = os.path.join(TEMPDIR, "testtar.tar.bz2")
 xzname = os.path.join(TEMPDIR, "testtar.tar.xz")
@@ -491,7 +491,7 @@ class CommonReadTest(ReadTest):
         # bpo-39017 (CVE-2019-20907): reading a zero-length header should fail
         # with an exception
         with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"):
-            with tarfile.open(support.findfile('recursion.tar')) as tar:
+            with tarfile.open(support.findfile('recursion.tar', subdir='archivetestdata')):
                 pass
 
     def test_extractfile_name(self):
@@ -2565,7 +2565,7 @@ class MiscTest(unittest.TestCase):
         support.check__all__(self, tarfile, not_exported=not_exported)
 
     def test_useful_error_message_when_modules_missing(self):
-        fname = os.path.join(os.path.dirname(__file__), 'testtar.tar.xz')
+        fname = os.path.join(os.path.dirname(__file__), 'archivetestdata', 'testtar.tar.xz')
         with self.assertRaises(tarfile.ReadError) as excinfo:
             error = tarfile.CompressionError('lzma module is not available'),
             with unittest.mock.patch.object(tarfile.TarFile, 'xzopen', side_effect=error):
@@ -2630,7 +2630,7 @@ class CommandLineTest(unittest.TestCase):
                 self.assertIn(b'is a tar archive.\n', out)
 
     def test_test_command_invalid_file(self):
-        zipname = support.findfile('zipdir.zip')
+        zipname = support.findfile('zipdir.zip', subdir='archivetestdata')
         rc, out, err = self.tarfilecmd_failure('-t', zipname)
         self.assertIn(b' is not a tar archive.', err)
         self.assertEqual(out, b'')
@@ -2672,7 +2672,7 @@ class CommandLineTest(unittest.TestCase):
                 self.assertEqual(out, expected)
 
     def test_list_command_invalid_file(self):
-        zipname = support.findfile('zipdir.zip')
+        zipname = support.findfile('zipdir.zip', subdir='archivetestdata')
         rc, out, err = self.tarfilecmd_failure('-l', zipname)
         self.assertIn(b' is not a tar archive.', err)
         self.assertEqual(out, b'')
@@ -2797,7 +2797,7 @@ class CommandLineTest(unittest.TestCase):
             os_helper.rmtree(tarextdir)
 
     def test_extract_command_invalid_file(self):
-        zipname = support.findfile('zipdir.zip')
+        zipname = support.findfile('zipdir.zip', subdir='archivetestdata')
         with os_helper.temp_cwd(tarextdir):
             rc, out, err = self.tarfilecmd_failure('-e', zipname)
         self.assertIn(b' is not a tar archive.', err)
diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py
index fb6b0b3..a51764b 100644
--- a/Lib/test/test_zipfile/test_core.py
+++ b/Lib/test/test_zipfile/test_core.py
@@ -1754,7 +1754,7 @@ class OtherTests(unittest.TestCase):
     @requires_zlib()
     def test_read_unicode_filenames(self):
         # bug #10801
-        fname = findfile('zip_cp437_header.zip')
+        fname = findfile('zip_cp437_header.zip', subdir='archivetestdata')
         with zipfile.ZipFile(fname) as zipfp:
             for name in zipfp.namelist():
                 zipfp.open(name).close()
@@ -2804,7 +2804,7 @@ class TestWithDirectory(unittest.TestCase):
         os.mkdir(TESTFN2)
 
     def test_extract_dir(self):
-        with zipfile.ZipFile(findfile("zipdir.zip")) as zipf:
+        with zipfile.ZipFile(findfile("zipdir.zip", subdir="archivetestdata")) as zipf:
             zipf.extractall(TESTFN2)
         self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a")))
         self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a", "b")))
@@ -2973,7 +2973,7 @@ class CommandLineTest(unittest.TestCase):
         self.assertNotEqual(err.strip(), b'')
 
     def test_test_command(self):
-        zip_name = findfile('zipdir.zip')
+        zip_name = findfile('zipdir.zip', subdir='archivetestdata')
         for opt in '-t', '--test':
             out = self.zipfilecmd(opt, zip_name)
             self.assertEqual(out.rstrip(), b'Done testing')
@@ -2982,7 +2982,7 @@ class CommandLineTest(unittest.TestCase):
         self.assertEqual(out, b'')
 
     def test_list_command(self):
-        zip_name = findfile('zipdir.zip')
+        zip_name = findfile('zipdir.zip', subdir='archivetestdata')
         t = io.StringIO()
         with zipfile.ZipFile(zip_name, 'r') as tf:
             tf.printdir(t)
@@ -3015,7 +3015,7 @@ class CommandLineTest(unittest.TestCase):
                 unlink(TESTFN2)
 
     def test_extract_command(self):
-        zip_name = findfile('zipdir.zip')
+        zip_name = findfile('zipdir.zip', subdir='archivetestdata')
         for opt in '-e', '--extract':
             with temp_dir() as extdir:
                 out = self.zipfilecmd(opt, zip_name, extdir)
@@ -3036,8 +3036,8 @@ class TestExecutablePrependedZip(unittest.TestCase):
     """Test our ability to open zip files with an executable prepended."""
 
     def setUp(self):
-        self.exe_zip = findfile('exe_with_zip', subdir='ziptestdata')
-        self.exe_zip64 = findfile('exe_with_z64', subdir='ziptestdata')
+        self.exe_zip = findfile('exe_with_zip', subdir='archivetestdata')
+        self.exe_zip64 = findfile('exe_with_z64', subdir='archivetestdata')
 
     def _test_zip_works(self, name):
         # bpo28494 sanity check: ensure is_zipfile works on these.
diff --git a/Lib/test/testtar.tar b/Lib/test/testtar.tar
deleted file mode 100644
index bb93453..0000000
Binary files a/Lib/test/testtar.tar and /dev/null differ
diff --git a/Lib/test/testtar.tar.xz b/Lib/test/testtar.tar.xz
deleted file mode 100644
index 512fa14..0000000
Binary files a/Lib/test/testtar.tar.xz and /dev/null differ
diff --git a/Lib/test/zip_cp437_header.zip b/Lib/test/zip_cp437_header.zip
deleted file mode 100644
index f7c6cf1..0000000
Binary files a/Lib/test/zip_cp437_header.zip and /dev/null differ
diff --git a/Lib/test/zipdir.zip b/Lib/test/zipdir.zip
deleted file mode 100644
index ac21d7a..0000000
Binary files a/Lib/test/zipdir.zip and /dev/null differ
diff --git a/Lib/test/ziptestdata/README.md b/Lib/test/ziptestdata/README.md
deleted file mode 100644
index 00d96d4..0000000
--- a/Lib/test/ziptestdata/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test data for `test_zipfile`
-
-The test executables in this directory are created manually from header.sh and
-the `testdata_module_inside_zip.py` file.  You must have Info-ZIP's zip utility
-installed (`apt install zip` on Debian).
-
-## Purpose
-
-These are used to test executable files with an appended zipfile, in a scenario
-where the executable is _not_ a Python interpreter itself so our automatic
-zipimport machinery (that'd look for `__main__.py`) is not being used.
-
-## Updating the test executables
-
-If you update header.sh or the testdata_module_inside_zip.py file, rerun the
-commands below.  These are expected to be rarely changed, if ever.
-
-### Standard old format (2.0) zip file
-
-```
-zip -0 zip2.zip testdata_module_inside_zip.py
-cat header.sh zip2.zip >exe_with_zip
-rm zip2.zip
-```
-
-### Modern format (4.5) zip64 file
-
-Redirecting from stdin forces Info-ZIP's zip tool to create a zip64.
-
-```
-zip -0 <testdata_module_inside_zip.py >zip64.zip
-cat header.sh zip64.zip >exe_with_z64
-rm zip64.zip
-```
-
diff --git a/Lib/test/ziptestdata/exe_with_z64 b/Lib/test/ziptestdata/exe_with_z64
deleted file mode 100755
index 82b03cf..0000000
Binary files a/Lib/test/ziptestdata/exe_with_z64 and /dev/null differ
diff --git a/Lib/test/ziptestdata/exe_with_zip b/Lib/test/ziptestdata/exe_with_zip
deleted file mode 100755
index c833cdf..0000000
Binary files a/Lib/test/ziptestdata/exe_with_zip and /dev/null differ
diff --git a/Lib/test/ziptestdata/header.sh b/Lib/test/ziptestdata/header.sh
deleted file mode 100755
index 52dc91a..0000000
--- a/Lib/test/ziptestdata/header.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-INTERPRETER_UNDER_TEST="$1"
-if [[ ! -x "${INTERPRETER_UNDER_TEST}" ]]; then
-    echo "Interpreter must be the command line argument."
-    exit 4
-fi
-EXECUTABLE="$0" exec "${INTERPRETER_UNDER_TEST}" -E - <<END_OF_PYTHON
-import os
-import zipfile
-
-namespace = {}
-
-filename = os.environ['EXECUTABLE']
-print(f'Opening {filename} as a zipfile.')
-with zipfile.ZipFile(filename, mode='r') as exe_zip:
-  for file_info in exe_zip.infolist():
-    data = exe_zip.read(file_info)
-    exec(data, namespace, namespace)
-    break  # Only use the first file in the archive.
-
-print('Favorite number in executable:', namespace["FAVORITE_NUMBER"])
-
-### Archive contents will be appended after this file. ###
-END_OF_PYTHON
diff --git a/Lib/test/ziptestdata/testdata_module_inside_zip.py b/Lib/test/ziptestdata/testdata_module_inside_zip.py
deleted file mode 100644
index 6f8dcd6..0000000
--- a/Lib/test/ziptestdata/testdata_module_inside_zip.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test data file to be stored within a zip file.
-FAVORITE_NUMBER = 5
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2950d87..20f2f6b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2169,6 +2169,7 @@ LIBSUBDIRS=	asyncio \
 TESTSUBDIRS=	idlelib/idle_test \
 		test \
 		test/audiodata \
+		test/archivetestdata \
 		test/certdata \
 		test/certdata/capath \
 		test/cjkencodings \
@@ -2283,8 +2284,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/tracedmodules \
 		test/typinganndata \
 		test/xmltestdata \
-		test/xmltestdata/c14n-20 \
-		test/ziptestdata
+		test/xmltestdata/c14n-20
 
 COMPILEALL_OPTS=-j0
 
-- 
cgit v0.12