Fix and improve tests

Author: danny0838

Lib/test/test_zipfile/test_core.py

@@ -1362,25 +1362,25 @@ class ZstdWriterTests(AbstractWriterTests, unittest.TestCase):
 
 class AbstractRemoveTests:
 
-    def _test_removing_indexes(self, test_files, indexes):
+    def _test_removing_members(self, test_files, indexes):
         """Test underlying _remove_members() for removing members at given
         indexes."""
         # calculate the expected results
         expected_files = []
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             for i, (file, data) in enumerate(test_files):
                 if i not in indexes:
                     zh.writestr(file, data)
                     expected_files.append(file)
         expected_size = os.path.getsize(TESTFN)
 
         # prepare the test zip
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             for file, data in test_files:
                 zh.writestr(file, data)
 
         # do the removal and check the result
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             members = {zh.infolist()[i] for i in indexes}
             zh._remove_members(members)
 
@@ -1401,19 +1401,14 @@ def _test_removing_combinations(self, test_files, n=None):
         """Test underlying _remove_members() for removing random combinations
         of members."""
         ln = len(test_files)
-        if n is None:
-            # iterate n from 1 to all
-            for n in range(1, ln + 1):
-                for indexes in itertools.combinations(range(ln), n):
-                    with self.subTest(remove=indexes):
-                        self._test_removing_indexes(test_files, indexes)
-        else:
+        for n in (range(1, ln + 1) if n is None else (n,)):
             for indexes in itertools.combinations(range(ln), n):
                 with self.subTest(remove=indexes):
-                    self._test_removing_indexes(test_files, indexes)
+                    self._test_removing_members(test_files, indexes)
 
     def test_basic(self):
-        # Test underlying _remove_members() for removing random combinations of members.
+        """Test underlying _remove_members() for removing random combinations
+        of members."""
         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'),
@@ -1423,7 +1418,8 @@ def test_basic(self):
         self._test_removing_combinations(test_files)
 
     def test_duplicated_arcname(self):
-        # Test underlying _remove_members() for removing any one of random duplicated members.
+        """Test underlying _remove_members() for removing any one of random
+        duplicated members."""
         dupl_file = 'file.txt'
         test_files = [
             ('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
@@ -1441,11 +1437,11 @@ def test_duplicated_arcname(self):
 
                 for index in dups:
                     indexes = [index]
-                    with self.subTest(dups=dups, indexes=indexes):
-                        self._test_removing_indexes(files, indexes)
+                    with self.subTest(dups=dups, remove=indexes):
+                        self._test_removing_members(files, indexes)
 
     def test_non_physical(self):
-        # Test underlying _remove_members() for non-physical removing.
+        """Test underlying _remove_members() for non-physical removing."""
         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'),
@@ -1458,14 +1454,14 @@ def test_non_physical(self):
                 with self.subTest(remove=indexes):
                     # prepare the test zip
                     expected = {}
-                    with zipfile.ZipFile(TESTFN, 'w') as zh:
+                    with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
                         for i, (file, data) in enumerate(test_files):
                             zh.writestr(file, data)
                             if i not in indexes:
                                 expected[file] = zh.getinfo(file).header_offset
 
                     # do the removal and check the result
-                    with zipfile.ZipFile(TESTFN, 'a') as zh:
+                    with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
                         members = {zh.infolist()[i] for i in indexes}
                         zh._remove_members(members, remove_physical=False)
                         self.assertEqual(zh.namelist(), list(expected))
@@ -1474,105 +1470,105 @@ def test_non_physical(self):
                         self.assertIsNone(zh.testzip())
 
     def test_verify(self):
-        # Test if params are passed to underlying _remove_members() correctly,
-        # or never passed if conditions not met.
+        """Test if params are passed to underlying _remove_members() correctly,
+        or never passed if conditions not met."""
         file0 = 'file0.txt'
         file = 'datafile.txt'
         data = b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'
 
         # closed: error and do nothing
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             zh.writestr(file, data)
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             zh.close()
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 with self.assertRaises(ValueError):
                     zh.remove(file)
                 mock_fn.assert_not_called()
 
         # writing: error and do nothing
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             zh.writestr(file, data)
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 with zh.open(file0, 'w') as fh:
                     with self.assertRaises(ValueError):
                         zh.remove(file)
                 mock_fn.assert_not_called()
 
         # mode 'r': error and do nothing
-        with zipfile.ZipFile(TESTFN, 'r') as zh:
+        with zipfile.ZipFile(TESTFN, 'r', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 with self.assertRaises(ValueError):
                     zh.remove(file)
                 mock_fn.assert_not_called()
 
         # mode 'a': the most general use case
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             zh.writestr(file, data)
         # -- remove with arcname
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 zh.remove(file)
                 mock_fn.assert_called_once_with({zh.getinfo(file)})
         # -- remove with zinfo
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 zinfo = zh.getinfo(file)
                 zh.remove(zinfo)
                 mock_fn.assert_called_once_with({zinfo})
         # -- remove with nonexist arcname
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 with self.assertRaises(KeyError):
                     zh.remove('nonexist.file')
                 mock_fn.assert_not_called()
         # -- remove with nonexist zinfo (even if same name)
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 zinfo = zipfile.ZipInfo(file)
                 with self.assertRaises(KeyError):
                     zh.remove(zinfo)
                 mock_fn.assert_not_called()
 
         # mode 'w': like 'a'; allows removing a just written member
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             zh.writestr(file, data)
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 zh.remove(file)
                 mock_fn.assert_called_once_with({zh.getinfo(file)})
 
         # mode 'x': like 'w'
         os.remove(TESTFN)
-        with zipfile.ZipFile(TESTFN, 'x') as zh:
+        with zipfile.ZipFile(TESTFN, 'x', self.compression) as zh:
             zh.writestr(file, data)
             with mock.patch('zipfile.ZipFile._remove_members') as mock_fn:
                 zh.remove(file)
                 mock_fn.assert_called_once_with({zh.getinfo(file)})
 
     def test_zip64(self):
-        # Test if members use zip64.
+        """Test if members use zip64."""
         file = 'datafile.txt'
         file1 = 'pre.txt'
         file2 = 'post.txt'
         data = b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'
         data1 = b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'
         data2 = b'Duis aute irure dolor in reprehenderit in voluptate velit esse'
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             with zh.open(file1, 'w', force_zip64=True) as fh:
                 fh.write(data1)
             with zh.open(file2, 'w', force_zip64=True) as fh:
                 fh.write(data2)
         expected_size = os.path.getsize(TESTFN)
 
-        with zipfile.ZipFile(TESTFN, 'w') as zh:
+        with zipfile.ZipFile(TESTFN, 'w', self.compression) as zh:
             with zh.open(file1, 'w', force_zip64=True) as fh:
                 fh.write(data1)
             with zh.open(file, 'w', force_zip64=True) as fh:
                 fh.write(data)
             with zh.open(file2, 'w', force_zip64=True) as fh:
                 fh.write(data2)
-        with zipfile.ZipFile(TESTFN, 'a') as zh:
+        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             zh.remove(file)
             self.assertIsNone(zh.testzip())
         self.assertEqual(os.path.getsize(TESTFN), expected_size)