Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle common setups with setUpClass

Browse source
This commit is contained in:
Danny Lin 2025-05-24 22:29:55 +08:00
parent 80ab2e27e4
commit 72c2a6678f
1 changed files with 58 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

184
Lib/test/test_zipfile/test_core.py
View file

@ -1390,18 +1390,20 @@ def _prepare_zip_from_test_files(self, zfname, test_files, force_zip64=False):
return zinfos return zinfos
class AbstractRemoveTests(RepackHelperMixin): class AbstractRemoveTests(RepackHelperMixin):
def test_remove_by_name(self): @classmethod
test_files = [ def setUpClass(self):
self.test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'), ('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'), ('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'), ('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
] ]
def test_remove_by_name(self):
for i in range(0, 3): for i in range(0, 3):
with self.subTest(i=i, filename=test_files[i][0]): with self.subTest(i=i, filename=self.test_files[i][0]):
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files) zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
# check infolist # check infolist
self.assertEqual( self.assertEqual(
@ -1411,21 +1413,15 @@ def test_remove_by_name(self):
# check NameToInfo cache # check NameToInfo cache
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
zh.getinfo(test_files[i][0]) zh.getinfo(self.test_files[i][0])
# make sure the zip file is still valid # make sure the zip file is still valid
self.assertIsNone(zh.testzip()) self.assertIsNone(zh.testzip())
def test_remove_by_zinfo(self): def test_remove_by_zinfo(self):
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for i in range(0, 3): for i in range(0, 3):
with self.subTest(i=i, filename=test_files[i][0]): with self.subTest(i=i, filename=self.test_files[i][0]):
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files) zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
zh.remove(zh.infolist()[i]) zh.remove(zh.infolist()[i])
@ -1437,31 +1433,19 @@ def test_remove_by_zinfo(self):
# check NameToInfo cache # check NameToInfo cache
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
zh.getinfo(test_files[i][0]) zh.getinfo(self.test_files[i][0])
# make sure the zip file is still valid # make sure the zip file is still valid
self.assertIsNone(zh.testzip()) self.assertIsNone(zh.testzip())
def test_remove_by_name_nonexist(self): def test_remove_by_name_nonexist(self):
test_files = [ zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
zh.remove('nonexist.txt') zh.remove('nonexist.txt')
def test_remove_by_zinfo_nonexist(self): def test_remove_by_zinfo_nonexist(self):
test_files = [ zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
zh.remove(zipfile.ZipInfo('nonexist.txt')) zh.remove(zipfile.ZipInfo('nonexist.txt'))
@ -1583,15 +1567,9 @@ def test_remove_by_zinfo_duplicated(self):
self.assertIsNone(zh.testzip()) self.assertIsNone(zh.testzip())
def test_remove_zip64(self): def test_remove_zip64(self):
test_files = [
('pre.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('datafile', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
('post.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
]
for i in range(0, 3): for i in range(0, 3):
with self.subTest(i=i, filename=test_files[i][0]): with self.subTest(i=i, filename=self.test_files[i][0]):
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files, force_zip64=True) zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files, force_zip64=True)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
zh.remove(zh.infolist()[i]) zh.remove(zh.infolist()[i])
@ -1603,7 +1581,7 @@ def test_remove_zip64(self):
# check NameToInfo cache # check NameToInfo cache
with self.assertRaises(KeyError): with self.assertRaises(KeyError):
zh.getinfo(test_files[i][0]) zh.getinfo(self.test_files[i][0])
# make sure the zip file is still valid # make sure the zip file is still valid
self.assertIsNone(zh.testzip()) self.assertIsNone(zh.testzip())
@ -1655,28 +1633,30 @@ class ZstdRemoveTests(AbstractRemoveTests, unittest.TestCase):
compression = zipfile.ZIP_ZSTANDARD compression = zipfile.ZIP_ZSTANDARD
class AbstractRepackTests(RepackHelperMixin): class AbstractRepackTests(RepackHelperMixin):
def test_repack_basic(self): @classmethod
"""Should remove local file entries for deleted files.""" def setUpClass(self):
test_files = [ self.test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'), ('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'), ('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'), ('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
] ]
ln = len(test_files) def test_repack_basic(self):
"""Should remove local file entries for deleted files."""
ln = len(self.test_files)
iii = (ii for n in range(1, ln + 1) for ii in itertools.combinations(range(ln), n)) iii = (ii for n in range(1, ln + 1) for ii in itertools.combinations(range(ln), n))
for ii in iii: for ii in iii:
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
expected_zinfos = self._prepare_zip_from_test_files(TESTFN, _test_files) expected_zinfos = self._prepare_zip_from_test_files(TESTFN, test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files) zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1693,28 +1673,22 @@ def test_repack_basic(self):
def test_repack_bytes_before_first_file(self): def test_repack_bytes_before_first_file(self):
"""Should preserve random bytes before the first recorded local file entry.""" """Should preserve random bytes before the first recorded local file entry."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([], [0], [0, 1], [0, 1, 2]): for ii in ([], [0], [0, 1], [0, 1, 2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
fh.write(b'dummy ') fh.write(b'dummy ')
expected_zinfos = self._prepare_zip_from_test_files(fh, _test_files) expected_zinfos = self._prepare_zip_from_test_files(fh, test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
fh.write(b'dummy ') fh.write(b'dummy ')
zinfos = self._prepare_zip_from_test_files(fh, test_files) zinfos = self._prepare_zip_from_test_files(fh, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1732,28 +1706,22 @@ def test_repack_bytes_before_first_file(self):
def test_repack_magic_before_first_file(self): def test_repack_magic_before_first_file(self):
"""Should preserve random signature bytes not forming a valid file entry """Should preserve random signature bytes not forming a valid file entry
before the first recorded local file entry.""" before the first recorded local file entry."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([], [0], [0, 1], [0, 1, 2]): for ii in ([], [0], [0, 1], [0, 1, 2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
fh.write(b'PK\003\004 ') fh.write(b'PK\003\004 ')
expected_zinfos = self._prepare_zip_from_test_files(fh, _test_files) expected_zinfos = self._prepare_zip_from_test_files(fh, test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
fh.write(b'PK\003\004 ') fh.write(b'PK\003\004 ')
zinfos = self._prepare_zip_from_test_files(fh, test_files) zinfos = self._prepare_zip_from_test_files(fh, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1775,21 +1743,15 @@ def test_repack_file_entry_before_first_file(self):
This may happen whan a self-extractor contains an uncompressed ZIP This may happen whan a self-extractor contains an uncompressed ZIP
library. (simulated by writing a ZIP file in this test) library. (simulated by writing a ZIP file in this test)
""" """
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([], [0], [0, 1], [0, 1, 2]): for ii in ([], [0], [0, 1], [0, 1, 2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
with zipfile.ZipFile(fh, 'w') as zh: with zipfile.ZipFile(fh, 'w') as zh:
zh.writestr('file.txt', b'dummy') zh.writestr('file.txt', b'dummy')
fh.write(b' ') fh.write(b' ')
expected_zinfos = self._prepare_zip_from_test_files(fh, _test_files) expected_zinfos = self._prepare_zip_from_test_files(fh, test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
@ -1797,10 +1759,10 @@ def test_repack_file_entry_before_first_file(self):
with zipfile.ZipFile(fh, 'w') as zh: with zipfile.ZipFile(fh, 'w') as zh:
zh.writestr('file.txt', b'dummy') zh.writestr('file.txt', b'dummy')
fh.write(b' ') fh.write(b' ')
zinfos = self._prepare_zip_from_test_files(fh, test_files) zinfos = self._prepare_zip_from_test_files(fh, self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1817,24 +1779,18 @@ def test_repack_file_entry_before_first_file(self):
def test_repack_zip64(self): def test_repack_zip64(self):
"""Should correctly handle file entries with zip64.""" """Should correctly handle file entries with zip64."""
test_files = [
('pre.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('datafile', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
('post.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
]
for ii in ([0], [0, 1], [1], [2]): for ii in ([0], [0, 1], [1], [2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
expected_zinfos = self._prepare_zip_from_test_files(TESTFN, _test_files, force_zip64=True) expected_zinfos = self._prepare_zip_from_test_files(TESTFN, test_files, force_zip64=True)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
zinfos = self._prepare_zip_from_test_files(TESTFN, test_files, force_zip64=True) zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files, force_zip64=True)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1851,30 +1807,24 @@ def test_repack_zip64(self):
def test_repack_data_descriptor(self): def test_repack_data_descriptor(self):
"""Should correctly handle file entries using data descriptor.""" """Should correctly handle file entries using data descriptor."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([0], [0, 1], [1], [2]): for ii in ([0], [0, 1], [1], [2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), _test_files) expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files) zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
# make sure data descriptor bit is really set (by making zipfile unseekable) # make sure data descriptor bit is really set (by making zipfile unseekable)
for zi in zh.infolist(): for zi in zh.infolist():
self.assertTrue(zi.flag_bits & 8, f'data descriptor not used: {zi.filename}') self.assertTrue(zi.flag_bits & 8, f'data descriptor not used: {zi.filename}')
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1891,30 +1841,24 @@ def test_repack_data_descriptor(self):
def test_repack_data_descriptor_and_zip64(self): def test_repack_data_descriptor_and_zip64(self):
"""Should correctly handle file entries using data descriptor and zip64.""" """Should correctly handle file entries using data descriptor and zip64."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([0], [0, 1], [1], [2]): for ii in ([0], [0, 1], [1], [2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), _test_files, force_zip64=True) expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files, force_zip64=True)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files, force_zip64=True) zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files, force_zip64=True)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
# make sure data descriptor bit is really set (by making zipfile unseekable) # make sure data descriptor bit is really set (by making zipfile unseekable)
for zi in zh.infolist(): for zi in zh.infolist():
self.assertTrue(zi.flag_bits & 8, f'data descriptor not used: {zi.filename}') self.assertTrue(zi.flag_bits & 8, f'data descriptor not used: {zi.filename}')
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1931,32 +1875,26 @@ def test_repack_data_descriptor_and_zip64(self):
def test_repack_data_descriptor_no_sig(self): def test_repack_data_descriptor_no_sig(self):
"""Should correctly handle file entries using data descriptor without signature.""" """Should correctly handle file entries using data descriptor without signature."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([0], [0, 1], [1], [2]): for ii in ([0], [0, 1], [1], [2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig): with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), _test_files) expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig): with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files) zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
# make sure data descriptor bit is really set (by making zipfile unseekable) # make sure data descriptor bit is really set (by making zipfile unseekable)
for zi in zh.infolist(): for zi in zh.infolist():
self.assertTrue(zi.flag_bits & 8, f'data descriptor flag not set: {zi.filename}') self.assertTrue(zi.flag_bits & 8, f'data descriptor flag not set: {zi.filename}')
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist
@ -1973,32 +1911,26 @@ def test_repack_data_descriptor_no_sig(self):
def test_repack_data_descriptor_no_sig_and_zip64(self): def test_repack_data_descriptor_no_sig_and_zip64(self):
"""Should correctly handle file entries using data descriptor without signature and zip64.""" """Should correctly handle file entries using data descriptor without signature and zip64."""
test_files = [
('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
]
for ii in ([0], [0, 1], [1], [2]): for ii in ([0], [0, 1], [1], [2]):
with self.subTest(remove=ii): with self.subTest(remove=ii):
# calculate the expected results # calculate the expected results
_test_files = [data for j, data in enumerate(test_files) if j not in ii] test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig): with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), _test_files, force_zip64=True) expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files, force_zip64=True)
expected_size = os.path.getsize(TESTFN) expected_size = os.path.getsize(TESTFN)
# do the removal and check the result # do the removal and check the result
with open(TESTFN, 'wb') as fh: with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig): with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files, force_zip64=True) zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files, force_zip64=True)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh: with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
# make sure data descriptor bit is really set (by making zipfile unseekable) # make sure data descriptor bit is really set (by making zipfile unseekable)
for zi in zh.infolist(): for zi in zh.infolist():
self.assertTrue(zi.flag_bits & 8, f'data descriptor flag not set: {zi.filename}') self.assertTrue(zi.flag_bits & 8, f'data descriptor flag not set: {zi.filename}')
for i in ii: for i in ii:
zh.remove(test_files[i][0]) zh.remove(self.test_files[i][0])
zh.repack() zh.repack()
# check infolist # check infolist