Skip to content

Commit 3f20906

Browse files
committed
GH-116380: Revert addition of test_iglob_iter_close test
Remove `test.test_glob.GlobTests.test_iglob_iter_close()`, which was added in da4899b. This fails on "Fedora Stable Clang Installed 3.x" build bots, for reasons that aren't clear to me.
1 parent da4899b commit 3f20906

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

Lib/test/test_glob.py

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import shutil
55
import sys
66
import unittest
7-
import unittest.mock
87
import warnings
98

109
from test import support
@@ -13,9 +12,6 @@
1312
can_symlink, create_empty_file, change_cwd)
1413

1514

16-
_supports_dir_fd = {os.open, os.stat} <= os.supports_dir_fd and os.scandir in os.supports_fd
17-
18-
1915
class GlobTests(unittest.TestCase):
2016
dir_fd = None
2117

@@ -53,7 +49,7 @@ def setUp(self):
5349
def open_dirfd(self):
5450
if self.dir_fd is not None:
5551
os.close(self.dir_fd)
56-
if _supports_dir_fd:
52+
if {os.open, os.stat} <= os.supports_dir_fd and os.scandir in os.supports_fd:
5753
self.dir_fd = os.open(self.tempdir, os.O_RDONLY | os.O_DIRECTORY)
5854
else:
5955
self.dir_fd = None
@@ -409,24 +405,6 @@ def test_glob_above_recursion_limit(self):
409405
with infinite_recursion(depth - 5):
410406
glob.glob(pattern, recursive=True)
411407

412-
@unittest.skipUnless(_supports_dir_fd, "Needs support for iglob(dir_fd=...)")
413-
def test_iglob_iter_close(self):
414-
base = os.path.join(self.tempdir, 'deep')
415-
p = os.path.join(base, *(['d'] * 10))
416-
os.makedirs(p)
417-
with (
418-
unittest.mock.patch("glob._StringGlobber.open", wraps=os.open) as os_open,
419-
unittest.mock.patch("glob._StringGlobber.close", wraps=os.close) as os_close
420-
):
421-
self.assertEqual(os_open.call_count, os_close.call_count)
422-
iter = glob.iglob('**/*/d', dir_fd=self.dir_fd, recursive=True)
423-
self.assertEqual(os_open.call_count, os_close.call_count)
424-
self.assertEqual(next(iter), 'deep/d')
425-
self.assertEqual(next(iter), 'deep/d/d')
426-
self.assertGreater(os_open.call_count, os_close.call_count)
427-
iter.close()
428-
self.assertEqual(os_open.call_count, os_close.call_count)
429-
430408
def test_glob0(self):
431409
with self.assertWarns(DeprecationWarning):
432410
glob.glob0(self.tempdir, 'a')

0 commit comments

Comments
 (0)