Skip to content

Commit

Permalink
Merge pull request #25 from ncoghlan/pep8-tests
Browse files Browse the repository at this point in the history 
format test_walkdir.py by PEP8
  • Loading branch information
@palaviv
palaviv committed Oct 8, 2018
2 parents 9b27808 + ac2f6df commit 54716b2
Showing 1 changed file with 132 additions and 133 deletions.
265 changes: 132 additions & 133 deletions test_walkdir.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def named_walk():
for dir_entry in fake_walk():
yield WalkedDir(*dir_entry)


expected_tree = [
('root', ['subdir1', 'subdir2', 'other'], ['file1.txt', 'file2.txt', 'other.txt']),
('root/subdir1', ['subdir1', 'subdir2', 'other'], ['file1.txt', 'file2.txt', 'other.txt']),
Expand Down Expand Up @@ -105,58 +106,58 @@ def named_walk():
]

expected_paths = [
'root',
'root/file1.txt',
'root/file2.txt',
'root/other.txt',
'root/subdir1',
'root/subdir2',
'root/other',
'root/subdir1/file1.txt',
'root/subdir1/file2.txt',
'root/subdir1/other.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir2',
'root/subdir1/other',
'root/subdir1/subdir1/file1.txt',
'root/subdir1/subdir1/file2.txt',
'root/subdir1/subdir1/other.txt',
'root/subdir1/subdir2/file1.txt',
'root/subdir1/subdir2/file2.txt',
'root/subdir1/subdir2/other.txt',
'root/subdir1/other/file1.txt',
'root/subdir1/other/file2.txt',
'root/subdir1/other/other.txt',
'root/subdir2/file1.txt',
'root/subdir2/file2.txt',
'root/subdir2/other.txt',
'root/subdir2/subdir1',
'root/subdir2/subdir2',
'root/subdir2/other',
'root/subdir2/subdir1/file1.txt',
'root/subdir2/subdir1/file2.txt',
'root/subdir2/subdir1/other.txt',
'root/subdir2/subdir2/file1.txt',
'root/subdir2/subdir2/file2.txt',
'root/subdir2/subdir2/other.txt',
'root/subdir2/other/file1.txt',
'root/subdir2/other/file2.txt',
'root/subdir2/other/other.txt',
'root/other/file1.txt',
'root/other/file2.txt',
'root/other/other.txt',
'root/other/subdir1',
'root/other/subdir2',
'root/other/other',
'root/other/subdir1/file1.txt',
'root/other/subdir1/file2.txt',
'root/other/subdir1/other.txt',
'root/other/subdir2/file1.txt',
'root/other/subdir2/file2.txt',
'root/other/subdir2/other.txt',
'root/other/other/file1.txt',
'root/other/other/file2.txt',
'root/other/other/other.txt'
'root',
'root/file1.txt',
'root/file2.txt',
'root/other.txt',
'root/subdir1',
'root/subdir2',
'root/other',
'root/subdir1/file1.txt',
'root/subdir1/file2.txt',
'root/subdir1/other.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir2',
'root/subdir1/other',
'root/subdir1/subdir1/file1.txt',
'root/subdir1/subdir1/file2.txt',
'root/subdir1/subdir1/other.txt',
'root/subdir1/subdir2/file1.txt',
'root/subdir1/subdir2/file2.txt',
'root/subdir1/subdir2/other.txt',
'root/subdir1/other/file1.txt',
'root/subdir1/other/file2.txt',
'root/subdir1/other/other.txt',
'root/subdir2/file1.txt',
'root/subdir2/file2.txt',
'root/subdir2/other.txt',
'root/subdir2/subdir1',
'root/subdir2/subdir2',
'root/subdir2/other',
'root/subdir2/subdir1/file1.txt',
'root/subdir2/subdir1/file2.txt',
'root/subdir2/subdir1/other.txt',
'root/subdir2/subdir2/file1.txt',
'root/subdir2/subdir2/file2.txt',
'root/subdir2/subdir2/other.txt',
'root/subdir2/other/file1.txt',
'root/subdir2/other/file2.txt',
'root/subdir2/other/other.txt',
'root/other/file1.txt',
'root/other/file2.txt',
'root/other/other.txt',
'root/other/subdir1',
'root/other/subdir2',
'root/other/other',
'root/other/subdir1/file1.txt',
'root/other/subdir1/file2.txt',
'root/other/subdir1/other.txt',
'root/other/subdir2/file1.txt',
'root/other/subdir2/file2.txt',
'root/other/subdir2/other.txt',
'root/other/other/file1.txt',
'root/other/other/file2.txt',
'root/other/other/other.txt'
]

# Between them, file_paths and all_dir_paths capture the all_paths output
Expand All @@ -166,64 +167,64 @@ def named_walk():
expected_dir_paths = [visited[0] for visited in expected_tree]

depth_0_paths = [
'root',
'root/file1.txt',
'root/file2.txt',
'root/other.txt',
'root/subdir1',
'root/subdir2',
'root/other',
'root',
'root/file1.txt',
'root/file2.txt',
'root/other.txt',
'root/subdir1',
'root/subdir2',
'root/other',
]

min_depth_1_paths = [
'root/subdir1',
'root/subdir1/file1.txt',
'root/subdir1/file2.txt',
'root/subdir1/other.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir2',
'root/subdir1/other',
'root/subdir1/subdir1/file1.txt',
'root/subdir1/subdir1/file2.txt',
'root/subdir1/subdir1/other.txt',
'root/subdir1/subdir2/file1.txt',
'root/subdir1/subdir2/file2.txt',
'root/subdir1/subdir2/other.txt',
'root/subdir1/other/file1.txt',
'root/subdir1/other/file2.txt',
'root/subdir1/other/other.txt',
'root/subdir2',
'root/subdir2/file1.txt',
'root/subdir2/file2.txt',
'root/subdir2/other.txt',
'root/subdir2/subdir1',
'root/subdir2/subdir2',
'root/subdir2/other',
'root/subdir2/subdir1/file1.txt',
'root/subdir2/subdir1/file2.txt',
'root/subdir2/subdir1/other.txt',
'root/subdir2/subdir2/file1.txt',
'root/subdir2/subdir2/file2.txt',
'root/subdir2/subdir2/other.txt',
'root/subdir2/other/file1.txt',
'root/subdir2/other/file2.txt',
'root/subdir2/other/other.txt',
'root/other',
'root/other/file1.txt',
'root/other/file2.txt',
'root/other/other.txt',
'root/other/subdir1',
'root/other/subdir2',
'root/other/other',
'root/other/subdir1/file1.txt',
'root/other/subdir1/file2.txt',
'root/other/subdir1/other.txt',
'root/other/subdir2/file1.txt',
'root/other/subdir2/file2.txt',
'root/other/subdir2/other.txt',
'root/other/other/file1.txt',
'root/other/other/file2.txt',
'root/other/other/other.txt'
'root/subdir1',
'root/subdir1/file1.txt',
'root/subdir1/file2.txt',
'root/subdir1/other.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir2',
'root/subdir1/other',
'root/subdir1/subdir1/file1.txt',
'root/subdir1/subdir1/file2.txt',
'root/subdir1/subdir1/other.txt',
'root/subdir1/subdir2/file1.txt',
'root/subdir1/subdir2/file2.txt',
'root/subdir1/subdir2/other.txt',
'root/subdir1/other/file1.txt',
'root/subdir1/other/file2.txt',
'root/subdir1/other/other.txt',
'root/subdir2',
'root/subdir2/file1.txt',
'root/subdir2/file2.txt',
'root/subdir2/other.txt',
'root/subdir2/subdir1',
'root/subdir2/subdir2',
'root/subdir2/other',
'root/subdir2/subdir1/file1.txt',
'root/subdir2/subdir1/file2.txt',
'root/subdir2/subdir1/other.txt',
'root/subdir2/subdir2/file1.txt',
'root/subdir2/subdir2/file2.txt',
'root/subdir2/subdir2/other.txt',
'root/subdir2/other/file1.txt',
'root/subdir2/other/file2.txt',
'root/subdir2/other/other.txt',
'root/other',
'root/other/file1.txt',
'root/other/file2.txt',
'root/other/other.txt',
'root/other/subdir1',
'root/other/subdir2',
'root/other/other',
'root/other/subdir1/file1.txt',
'root/other/subdir1/file2.txt',
'root/other/subdir1/other.txt',
'root/other/subdir2/file1.txt',
'root/other/subdir2/file2.txt',
'root/other/subdir2/other.txt',
'root/other/other/file1.txt',
'root/other/other/file2.txt',
'root/other/other/other.txt'
]

min_depth_1_dir_paths = [d for d in min_depth_1_paths if not d.endswith('.txt')]
Expand All @@ -233,12 +234,12 @@ def named_walk():
depth_0_file_paths = [f for f in depth_0_paths if f.endswith('.txt')]

filtered_paths = [
'root',
'root/file1.txt',
'root/subdir1',
'root/subdir1/file1.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir1/file1.txt',
'root',
'root/file1.txt',
'root/subdir1',
'root/subdir1/file1.txt',
'root/subdir1/subdir1',
'root/subdir1/subdir1/file1.txt',
]

filtered_dir_paths = [d for d in filtered_paths if not d.endswith('.txt')]
Expand Down Expand Up @@ -477,7 +478,7 @@ def test_exclude_dirs(self):

def test_filter_dirs(self):
walk_iter = self.filtered_walk(included_dirs=['sub*'],
excluded_dirs=['*2'])
excluded_dirs=['*2'])
self.assertWalkEqual(dir_filtered_tree, walk_iter)

def test_include_files(self):
Expand All @@ -502,7 +503,7 @@ def test_exclude_files(self):

def test_filter_files(self):
walk_iter = self.filtered_walk(included_files=['file*'],
excluded_files=['*2*'])
excluded_files=['*2*'])
for dir_entry in walk_iter:
self.assertFilesEqual(dir_entry, ['file1.txt'])

Expand All @@ -524,48 +525,48 @@ class PathIterationTestCase(_BaseWalkTestCase):
def test_all_paths(self):
self.assertPathsEqual(expected_paths, all_paths(self.filtered_walk()))
self.assertPathsEqual(min_depth_1_paths,
all_paths(self.filtered_walk(min_depth=1)))
all_paths(self.filtered_walk(min_depth=1)))
self.assertPathsEqual(depth_0_paths, all_paths(self.filtered_walk(depth=0)))
walk_iter = self.filtered_walk(included_files=['file*'],
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'],)
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'], )
self.assertPathsEqual(filtered_paths, all_paths(walk_iter))
self.assertPathsEqual([], all_paths(iter(())))

def test_dir_paths(self):
self.assertPathsEqual(expected_dir_paths, dir_paths(self.filtered_walk()))
self.assertPathsEqual(min_depth_1_dir_paths,
dir_paths(self.filtered_walk(min_depth=1)))
dir_paths(self.filtered_walk(min_depth=1)))
self.assertPathsEqual(depth_0_dir_paths, dir_paths(self.filtered_walk(depth=0)))
walk_iter = self.filtered_walk(included_files=['file*'],
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
self.assertPathsEqual(filtered_dir_paths, dir_paths(walk_iter))

def test_all_dir_paths(self):
self.assertPathsEqual(expected_all_dir_paths,
all_dir_paths(self.filtered_walk()))
self.assertPathsEqual(min_depth_1_dir_paths,
all_dir_paths(self.filtered_walk(min_depth=1)))
all_dir_paths(self.filtered_walk(min_depth=1)))
self.assertPathsEqual(depth_0_all_dir_paths,
all_dir_paths(self.filtered_walk(depth=0)))
walk_iter = self.filtered_walk(included_files=['file*'],
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
self.assertPathsEqual(filtered_dir_paths, all_dir_paths(walk_iter))

def test_file_paths(self):
self.assertPathsEqual(expected_file_paths, file_paths(self.filtered_walk()))
self.assertPathsEqual(expected_file_paths[len(depth_0_file_paths):],
file_paths(self.filtered_walk(min_depth=1)))
file_paths(self.filtered_walk(min_depth=1)))
self.assertPathsEqual(depth_0_file_paths, file_paths(self.filtered_walk(depth=0)))
walk_iter = self.filtered_walk(included_files=['file*'],
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
excluded_files=['*2*'],
included_dirs=['sub*'],
excluded_dirs=['*2'])
self.assertPathsEqual(filtered_file_paths, file_paths(walk_iter))


Expand Down Expand Up @@ -642,7 +643,5 @@ def test_symlink_to_current_directory(self):
handle_symlink_loops(self.walk(followlinks=True)))




if __name__ == "__main__":
unittest.main()

0 comments on commit 54716b2

Please sign in to comment.