mirror of
https://github.com/python/cpython
synced 2024-10-14 09:58:30 +00:00
gh-108303: Move zip
and tar
archives to Lib/test/archivetestdata
(#111549)
This commit is contained in:
parent
18c954849b
commit
890ef1b035
|
@ -1,21 +1,23 @@
|
|||
# Test data for `test_zipfile`
|
||||
# Test data for `test_zipfile`, `test_tarfile` (and even some others)
|
||||
|
||||
The test executables in this directory are created manually from header.sh and
|
||||
## `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
|
||||
### 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
|
||||
### 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
|
||||
#### Standard old format (2.0) zip file
|
||||
|
||||
```
|
||||
zip -0 zip2.zip testdata_module_inside_zip.py
|
||||
|
@ -23,7 +25,7 @@ ### Standard old format (2.0) zip file
|
|||
rm zip2.zip
|
||||
```
|
||||
|
||||
### Modern format (4.5) zip64 file
|
||||
#### Modern format (4.5) zip64 file
|
||||
|
||||
Redirecting from stdin forces Info-ZIP's zip tool to create a zip64.
|
||||
|
||||
|
@ -32,4 +34,3 @@ ### Modern format (4.5) zip64 file
|
|||
cat header.sh zip64.zip >exe_with_z64
|
||||
rm zip64.zip
|
||||
```
|
||||
|
|
@ -1318,7 +1318,7 @@ def test_simple(self):
|
|||
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)
|
||||
|
||||
|
|
|
@ -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 @@ def test_length_zero_header(self):
|
|||
# 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 @@ def test__all__(self):
|
|||
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 @@ def test_test_command_verbose(self):
|
|||
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 @@ def test_list_command_verbose(self):
|
|||
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 @@ def test_extract_command_different_directory(self):
|
|||
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)
|
||||
|
|
|
@ -1754,7 +1754,7 @@ def test_unsupported_version(self):
|
|||
@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 @@ def setUp(self):
|
|||
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 @@ def test_bad_use(self):
|
|||
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 @@ def test_test_command(self):
|
|||
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 @@ def test_create_command(self):
|
|||
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.
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue