mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #23605: Refactor os.walk() tests to also run them on os.fwalk()

This commit is contained in:
Victor Stinner 2015-03-12 10:28:24 +01:00
parent a112a8ae47
commit 0561c53d78
1 changed files with 74 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Lib/test/test_os.py
View File

@ -694,9 +694,17 @@ def test_key_type(self):
class WalkTests(unittest.TestCase): class WalkTests(unittest.TestCase):
"""Tests for os.walk().""" """Tests for os.walk()."""
# Wrapper to hide minor differences between os.walk and os.fwalk
# to tests both functions with the same code base
def walk(self, directory, topdown=True, follow_symlinks=False):
walk_it = os.walk(directory,
topdown=topdown,
followlinks=follow_symlinks)
for root, dirs, files in walk_it:
yield (root, dirs, files)
def setUp(self): def setUp(self):
import os join = os.path.join
from os.path import join
# Build: # Build:
# TESTFN/ # TESTFN/
@ -711,36 +719,39 @@ def setUp(self):
# broken_link # broken_link
# TEST2/ # TEST2/
# tmp4 a lone file # tmp4 a lone file
walk_path = join(support.TESTFN, "TEST1") self.walk_path = join(support.TESTFN, "TEST1")
sub1_path = join(walk_path, "SUB1") self.sub1_path = join(self.walk_path, "SUB1")
sub11_path = join(sub1_path, "SUB11") self.sub11_path = join(self.sub1_path, "SUB11")
sub2_path = join(walk_path, "SUB2") sub2_path = join(self.walk_path, "SUB2")
tmp1_path = join(walk_path, "tmp1") tmp1_path = join(self.walk_path, "tmp1")
tmp2_path = join(sub1_path, "tmp2") tmp2_path = join(self.sub1_path, "tmp2")
tmp3_path = join(sub2_path, "tmp3") tmp3_path = join(sub2_path, "tmp3")
link_path = join(sub2_path, "link") self.link_path = join(sub2_path, "link")
t2_path = join(support.TESTFN, "TEST2") t2_path = join(support.TESTFN, "TEST2")
tmp4_path = join(support.TESTFN, "TEST2", "tmp4") tmp4_path = join(support.TESTFN, "TEST2", "tmp4")
link_path = join(sub2_path, "link")
broken_link_path = join(sub2_path, "broken_link") broken_link_path = join(sub2_path, "broken_link")
# Create stuff. # Create stuff.
os.makedirs(sub11_path) os.makedirs(self.sub11_path)
os.makedirs(sub2_path) os.makedirs(sub2_path)
os.makedirs(t2_path) os.makedirs(t2_path)
for path in tmp1_path, tmp2_path, tmp3_path, tmp4_path: for path in tmp1_path, tmp2_path, tmp3_path, tmp4_path:
f = open(path, "w") f = open(path, "w")
f.write("I'm " + path + " and proud of it. Blame test_os.\n") f.write("I'm " + path + " and proud of it. Blame test_os.\n")
f.close() f.close()
if support.can_symlink():
os.symlink(os.path.abspath(t2_path), link_path)
os.symlink('broken', broken_link_path, True)
sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
else:
sub2_tree = (sub2_path, [], ["tmp3"])
if support.can_symlink():
os.symlink(os.path.abspath(t2_path), self.link_path)
os.symlink('broken', broken_link_path, True)
self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
else:
self.sub2_tree = (sub2_path, [], ["tmp3"])
def test_walk_topdown(self):
# Walk top-down. # Walk top-down.
all = list(os.walk(walk_path)) all = list(os.walk(self.walk_path))
self.assertEqual(len(all), 4) self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in. # We can't know which order SUB1 and SUB2 will appear in.
# Not flipped: TESTFN, SUB1, SUB11, SUB2 # Not flipped: TESTFN, SUB1, SUB11, SUB2
@ -748,26 +759,32 @@ def setUp(self):
flipped = all[0][1][0] != "SUB1" flipped = all[0][1][0] != "SUB1"
all[0][1].sort() all[0][1].sort()
all[3 - 2 * flipped][-1].sort() all[3 - 2 * flipped][-1].sort()
self.assertEqual(all[0], (walk_path, ["SUB1", "SUB2"], ["tmp1"])) self.assertEqual(all[0], (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"])) self.assertEqual(all[1 + flipped], (self.sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 + flipped], (sub11_path, [], [])) self.assertEqual(all[2 + flipped], (self.sub11_path, [], []))
self.assertEqual(all[3 - 2 * flipped], sub2_tree) self.assertEqual(all[3 - 2 * flipped], self.sub2_tree)
def test_walk_prune(self):
# Prune the search. # Prune the search.
all = [] all = []
for root, dirs, files in os.walk(walk_path): for root, dirs, files in self.walk(self.walk_path):
all.append((root, dirs, files)) all.append((root, dirs, files))
# Don't descend into SUB1. # Don't descend into SUB1.
if 'SUB1' in dirs: if 'SUB1' in dirs:
# Note that this also mutates the dirs we appended to all! # Note that this also mutates the dirs we appended to all!
dirs.remove('SUB1') dirs.remove('SUB1')
self.assertEqual(len(all), 2)
self.assertEqual(all[0], (walk_path, ["SUB2"], ["tmp1"]))
all[1][-1].sort()
self.assertEqual(all[1], sub2_tree)
self.assertEqual(len(all), 2)
self.assertEqual(all[0],
(self.walk_path, ["SUB2"], ["tmp1"]))
all[1][-1].sort()
self.assertEqual(all[1], self.sub2_tree)
def test_walk_bottom_up(self):
# Walk bottom-up. # Walk bottom-up.
all = list(os.walk(walk_path, topdown=False)) all = list(self.walk(self.walk_path, topdown=False))
self.assertEqual(len(all), 4) self.assertEqual(len(all), 4)
# We can't know which order SUB1 and SUB2 will appear in. # We can't know which order SUB1 and SUB2 will appear in.
# Not flipped: SUB11, SUB1, SUB2, TESTFN # Not flipped: SUB11, SUB1, SUB2, TESTFN
@ -775,20 +792,28 @@ def setUp(self):
flipped = all[3][1][0] != "SUB1" flipped = all[3][1][0] != "SUB1"
all[3][1].sort() all[3][1].sort()
all[2 - 2 * flipped][-1].sort() all[2 - 2 * flipped][-1].sort()
self.assertEqual(all[3], (walk_path, ["SUB1", "SUB2"], ["tmp1"])) self.assertEqual(all[3],
self.assertEqual(all[flipped], (sub11_path, [], [])) (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[flipped + 1], (sub1_path, ["SUB11"], ["tmp2"])) self.assertEqual(all[flipped],
self.assertEqual(all[2 - 2 * flipped], sub2_tree) (self.sub11_path, [], []))
self.assertEqual(all[flipped + 1],
(self.sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 - 2 * flipped],
self.sub2_tree)
if support.can_symlink(): def test_walk_symlink(self):
# Walk, following symlinks. if not support.can_symlink():
for root, dirs, files in os.walk(walk_path, followlinks=True): self.skipTest("need symlink support")
if root == link_path:
self.assertEqual(dirs, []) # Walk, following symlinks.
self.assertEqual(files, ["tmp4"]) walk_it = self.walk(self.walk_path, follow_symlinks=True)
break for root, dirs, files in walk_it:
else: if root == self.link_path:
self.fail("Didn't follow symlink with followlinks=True") self.assertEqual(dirs, [])
self.assertEqual(files, ["tmp4"])
break
else:
self.fail("Didn't follow symlink with followlinks=True")
def tearDown(self): def tearDown(self):
# Tear everything down. This is a decent use for bottom-up on # Tear everything down. This is a decent use for bottom-up on
@ -811,6 +836,14 @@ def tearDown(self):
class FwalkTests(WalkTests): class FwalkTests(WalkTests):
"""Tests for os.fwalk().""" """Tests for os.fwalk()."""
def walk(self, directory, topdown=True, follow_symlinks=False):
walk_it = os.fwalk(directory,
topdown=topdown,
follow_symlinks=follow_symlinks)
for root, dirs, files, root_fd in walk_it:
yield (root, dirs, files)
def _compare_to_walk(self, walk_kwargs, fwalk_kwargs): def _compare_to_walk(self, walk_kwargs, fwalk_kwargs):
""" """
compare with walk() results. compare with walk() results.