From 3f20906accfdf3af13762c4dcf59bd57547577be Mon Sep 17 00:00:00 2001 From: barneygale Date: Fri, 28 Feb 2025 22:44:55 +0000 Subject: [PATCH] GH-116380: Revert addition of `test_iglob_iter_close` test Remove `test.test_glob.GlobTests.test_iglob_iter_close()`, which was added in da4899b9. This fails on "Fedora Stable Clang Installed 3.x" build bots, for reasons that aren't clear to me. --- Lib/test/test_glob.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py index 2290e06e60e377..7c57e9e660e324 100644 --- a/Lib/test/test_glob.py +++ b/Lib/test/test_glob.py @@ -4,7 +4,6 @@ import shutil import sys import unittest -import unittest.mock import warnings from test import support @@ -13,9 +12,6 @@ can_symlink, create_empty_file, change_cwd) -_supports_dir_fd = {os.open, os.stat} <= os.supports_dir_fd and os.scandir in os.supports_fd - - class GlobTests(unittest.TestCase): dir_fd = None @@ -53,7 +49,7 @@ def setUp(self): def open_dirfd(self): if self.dir_fd is not None: os.close(self.dir_fd) - if _supports_dir_fd: + if {os.open, os.stat} <= os.supports_dir_fd and os.scandir in os.supports_fd: self.dir_fd = os.open(self.tempdir, os.O_RDONLY | os.O_DIRECTORY) else: self.dir_fd = None @@ -409,24 +405,6 @@ def test_glob_above_recursion_limit(self): with infinite_recursion(depth - 5): glob.glob(pattern, recursive=True) - @unittest.skipUnless(_supports_dir_fd, "Needs support for iglob(dir_fd=...)") - def test_iglob_iter_close(self): - base = os.path.join(self.tempdir, 'deep') - p = os.path.join(base, *(['d'] * 10)) - os.makedirs(p) - with ( - unittest.mock.patch("glob._StringGlobber.open", wraps=os.open) as os_open, - unittest.mock.patch("glob._StringGlobber.close", wraps=os.close) as os_close - ): - self.assertEqual(os_open.call_count, os_close.call_count) - iter = glob.iglob('**/*/d', dir_fd=self.dir_fd, recursive=True) - self.assertEqual(os_open.call_count, os_close.call_count) - self.assertEqual(next(iter), 'deep/d') - self.assertEqual(next(iter), 'deep/d/d') - self.assertGreater(os_open.call_count, os_close.call_count) - iter.close() - self.assertEqual(os_open.call_count, os_close.call_count) - def test_glob0(self): with self.assertWarns(DeprecationWarning): glob.glob0(self.tempdir, 'a')