Skip to content

Commit

Permalink
bpo-37935: Added tests for os.walk(), glob.iglob() and Path.glob() (p…
Browse files Browse the repository at this point in the history
…ythonGH-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).
  • Loading branch information
serhiy-storchaka authored and gpshead committed Sep 12, 2019
1 parent 5a4f82f commit f9dc2ad
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 0 deletions.
17 changes: 17 additions & 0 deletions Lib/test/test_glob.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,23 @@ def test_recursive_glob(self):
expect += [join('sym3', 'EF')]
eq(glob.glob(join('**', 'EF'), recursive=True), expect)

def test_glob_many_open_files(self):
depth = 30
base = os.path.join(self.tempdir, 'deep')
p = os.path.join(base, *(['d']*depth))
os.makedirs(p)
pattern = os.path.join(base, *(['*']*depth))
iters = [glob.iglob(pattern, recursive=True) for j in range(100)]
for it in iters:
self.assertEqual(next(it), p)
pattern = os.path.join(base, '**', 'd')
iters = [glob.iglob(pattern, recursive=True) for j in range(100)]
p = base
for i in range(depth):
p = os.path.join(p, 'd')
for it in iters:
self.assertEqual(next(it), p)


@skip_unless_symlink
class SymlinkLoopGlobTests(unittest.TestCase):
Expand Down
25 changes: 25 additions & 0 deletions Lib/test/test_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,27 @@ def test_walk_bad_dir(self):
finally:
os.rename(path1new, path1)

def test_walk_many_open_files(self):
depth = 30
base = os.path.join(support.TESTFN, 'deep')
p = os.path.join(base, *(['d']*depth))
os.makedirs(p)

iters = [self.walk(base, topdown=False) for j in range(100)]
for i in range(depth + 1):
expected = (p, ['d'] if i else [], [])
for it in iters:
self.assertEqual(next(it), expected)
p = os.path.dirname(p)

iters = [self.walk(base, topdown=True) for j in range(100)]
p = base
for i in range(depth + 1):
expected = (p, ['d'] if i < depth else [], [])
for it in iters:
self.assertEqual(next(it), expected)
p = os.path.join(p, 'd')


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

# fwalk() keeps file descriptors open
test_walk_many_open_files = None


class BytesWalkTests(WalkTests):
"""Tests for os.walk() with bytes."""
def walk(self, top, **kwargs):
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,23 @@ def test_rglob_symlink_loop(self):
}
self.assertEqual(given, {p / x for x in expect})

def test_glob_many_open_files(self):
depth = 30
P = self.cls
base = P(BASE) / 'deep'
p = P(base, *(['d']*depth))
p.mkdir(parents=True)
pattern = '/'.join(['*'] * depth)
iters = [base.glob(pattern) for j in range(100)]
for it in iters:
self.assertEqual(next(it), p)
iters = [base.rglob('d') for j in range(100)]
p = base
for i in range(depth):
p = p / 'd'
for it in iters:
self.assertEqual(next(it), p)

def test_glob_dotdot(self):
# ".." is not special in globs.
P = self.cls
Expand Down

0 comments on commit f9dc2ad

Please sign in to comment.