8000 bpo-37935: Added tests for os.walk(), glob.iglob() and Path.glob() (G… · python/cpython@f9dc2ad · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit f9dc2ad

Browse files
serhiy-storchakagpshead
serhiy-storchaka
authored and
gpshead
committed
bpo-37935: Added tests for os.walk(), glob.iglob() and Path.glob() (GH-15956)
Test that they do not keep too many file descriptors open for the host OS in a reasonable test scenario. See [bpo-37935](https://bugs.python.org/issue37935).
1 parent 5a4f82f commit f9dc2ad

File tree

3 files changed

+59
-0
lines changed

3 files changed

+59
-0
lines changed

‎Lib/test/test_glob.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,23 @@ def test_recursive_glob(self):
264264
expect += [join('sym3', 'EF')]
265265
eq(glob.glob(join('**', 'EF'), recursive=True), expect)
266266

267+
def test_glob_many_open_files(self):
268+
depth = 30
269+
base = os.path.join(self.tempdir, 'deep')
270+
p = os.path.join(base, *(['d']*depth))
271+
os.makedirs(p)
272+
pattern = os.path.join(base, *(['*']*depth))
273+
iters = [glob.iglob(pattern, recursive=True) for j in range(100)]
274+
for it in iters:
275+
self.assertEqual(next(it), p)
276+
pattern = os.path.join(base, '**', 'd')
277+
iters = [glob.iglob(pattern, recursive=True) for j in range(100)]
278+
p = base
279+
for i in range(depth):
280+
p = os.path.join(p, 'd')
281+
for it in iters:
282+
self.assertEqual(next(it), p)
283+
267284

268285
@skip_unless_symlink
269286
class SymlinkLoopGlobTests(unittest.TestCase):

‎Lib/test/test_os.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,27 @@ def test_walk_bad_dir(self):
11781178
finally:
11791179
os.rename(path1new, path1)
11801180

1181+
def test_walk_many_open_files(self):
1182+
depth = 30
1183+
base = os.path.join(support.TESTFN, 'deep')
1184+
p = os.path.join(base, *(['d']*depth))
1185+
os.makedirs(p)
1186+
1187+
iters = [self.walk(base, topdown=False) for j in range(100)]
1188+
for i in range(depth + 1):
1189+
expected = (p, ['d'] if i else [], [])
1190+
for it in iters:
1191+
self.assertEqual(next(it), expected)
1192+
p = os.path.dirname(p)
1193+
1194+
iters = [self.walk(base, topdown=True) for j in range(100)]
1195+
p = base
1196+
for i in range(depth + 1):
1197+
expected = (p, ['d'] if i < depth else [], [])
1198+
for it in iters:
1199+
self.assertEqual(next(it), expected)
1200+
p = os.path.join(p, 'd')
1201+
11811202

11821203
@unittest.skipUnless(hasattr(os, 'fwalk'), "Test needs os.fwalk()")
11831204
class FwalkTests(WalkTests):
@@ -1247,6 +1268,10 @@ def test_fd_leak(self):
12471268
self.addCleanup(os.close, newfd)
12481269
self.assertEqual(newfd, minfd)
12491270

1271+
# fwalk() keeps file descriptors open
1272+
test_walk_many_open_files = None
1273+
1274+
12501275
class BytesWalkTests(WalkTests):
12511276
"""Tests for os.walk() with bytes."""
12521277
def walk(self, top, **kwargs):

‎Lib/test/test_pathlib.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,6 +1562,23 @@ def test_rglob_symlink_loop(self):
15621562
}
15631563
self.assertEqual(given, {p / x for x in expect})
15641564

1565+
def test_glob_many_open_files(self):
1566+
depth = 30
1567+
P = self.cls
1568+
base = P(BASE) / 'deep'
1569+
p = P(base, *(['d']*depth))
1570+
p.mkdir(parents=True)
1571+
pattern = '/'.join(['*'] * depth)
1572+
iters = [base.glob(pattern) for j in range(100)]
1573+
for it in iters:
1574+
self.assertEqual(next(it), p)
1575+
iters = [base.rglob('d') for j in range(100)]
1576+
p = base
1577+
for i in range(depth):
1578+
p = p / 'd'
1579+
for it in iters:
1580+
self.assertEqual(next(it), p)
1581+
15651582
def test_glob_dotdot(self):
15661583
# ".." is not special in globs.
15671584
P = self.cls

0 commit comments

Comments
 (0)
0