Work around Path.glob() failure in 3.10

encukou · encukou · commit dff62a1ede34 · 2025-06-03T17:54:36.000+02:00
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
@@ -3338,7 +3338,7 @@ class TestExtractionFilters(unittest.TestCase):
     destdir = outerdir / 'dest'
 
     @contextmanager
-    def check_context(self, tar, filter, *, check_flag=True):
+    def check_context(self, tar, filter, *, check_flag=True, ignored_trees=()):
         """Extracts `tar` to `self.destdir` and allows checking the result
 
         If an error occurs, it must be checked using `expect_exception`
@@ -3351,6 +3351,10 @@ def check_context(self, tar, filter, *, check_flag=True):
         A file called 'flag' is made in outerdir (i.e. outside destdir)
         before extraction; it should not be altered nor should its contents
         be read/copied.
+
+        *ignored_trees* is a set of directories to remove (including their
+        contents) right after the archive is extracted. It is a workaround
+        for Path.glob() failing to get all files in Python 3.10 and below.
         """
         with os_helper.temp_dir(self.outerdir):
             flag_path = self.outerdir / 'flag'
@@ -3362,6 +3366,8 @@ def check_context(self, tar, filter, *, check_flag=True):
                 self.reraise_exception = True
                 self.expected_paths = set()
             else:
+                for ignored_tree in ignored_trees:
+                    os_helper.rmtree((self.destdir / ignored_tree).resolve())
                 self.raised_exception = None
                 self.reraise_exception = False
                 self.expected_paths = set(self.outerdir.glob('**/*'))
@@ -3573,15 +3579,14 @@ def test_realpath_limit_attack(self):
 
         with (self.subTest('fully_trusted'),
               self.check_context(arc.open(), filter='fully_trusted',
-                                 check_flag=False)):
+                                 check_flag=False, ignored_trees={component})):
             if sys.platform == 'win32':
                 self.expect_exception((FileNotFoundError, FileExistsError))
             elif self.raised_exception:
                 # Cannot symlink/hardlink: tarfile falls back to getmember()
                 self.expect_exception(KeyError)
                 # Otherwise, this block should never enter.
             else:
-                self.expect_any_tree(component)
                 self.expect_file('flaglink', content='overwrite')
                 self.expect_file('../newfile', content='new')
                 self.expect_file('escape', type=tarfile.SYMTYPE)
