dir-iterator is lacking test coverage for some cases: * root directory and/or subdirectories w/o perms * pedantic runs on directories with cyclical symlinks * more thorough tests without sorting expected and actual outputs Improve test coverage by introducing tests that test ELOOP and EACCES errno and various directory hierarchies that cover most cases. Signed-off-by: Plato Kiorpelidis <kioplato@xxxxxxxxx> --- t/t0066-dir-iterator.sh | 290 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 289 insertions(+), 1 deletion(-) diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh index 61b02423d5..932b1f291c 100755 --- a/t/t0066-dir-iterator.sh +++ b/t/t0066-dir-iterator.sh @@ -5,6 +5,97 @@ test_description='Test the dir-iterator functionality' TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh +test_expect_success 'setup -- dir with a single file' ' + mkdir dir1 && + >dir1/a +' +test_expect_success 'iteration of dir with a file' ' + cat >expected-out <<-EOF && + [f] (a) [a] ./dir1/a + EOF + + test-tool dir-iterator ./dir1 >actual-out && + test_cmp expected-out actual-out +' + +test_expect_success 'setup -- dir with a single dir' ' + mkdir -p dir6/a +' +test_expect_success 'iteration of dir with a single dir' ' + cat >expected-out <<-EOF && + [d] (a) [a] ./dir6/a + EOF + + test-tool dir-iterator ./dir6 >actual-out && + test_cmp expected-out actual-out +' + +test_expect_success POSIXPERM,SANITY 'setup -- dir w/ single dir w/o perms' ' + mkdir -p dir13/a +' +test_expect_success POSIXPERM,SANITY 'iteration of dir w/ dir w/o perms' ' + cat >expected-out <<-EOF && + [d] (a) [a] ./dir13/a + EOF + + chmod 0 dir13/a && + + test-tool dir-iterator ./dir13/ >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir13/a +' +test_expect_success POSIXPERM,SANITY 'pedantic iteration of dir w/ dir w/o perms' ' + cat >expected-out <<-EOF && + [d] (a) [a] ./dir13/a + dir_iterator_advance failure: EACCES + EOF + + chmod 0 dir13/a && + + test_must_fail test-tool dir-iterator --pedantic ./dir13/ >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir13/a +' + +test_expect_success 'setup -- dir w/ five files' ' + mkdir dir14 && + >dir14/a && + >dir14/b && + >dir14/c && + >dir14/d && + >dir14/e +' +test_expect_success 'iteration of dir w/ five files' ' + cat >expected-sorted-out <<-EOF && + [f] (a) [a] ./dir14/a + [f] (b) [b] ./dir14/b + [f] (c) [c] ./dir14/c + [f] (d) [d] ./dir14/d + [f] (e) [e] ./dir14/e + EOF + + test-tool dir-iterator ./dir14 >actual-out && + sort actual-out >actual-sorted-out && + + test_cmp expected-sorted-out actual-sorted-out +' + +test_expect_success 'setup -- dir w/ dir w/ a file' ' + mkdir -p dir15/a && + >dir15/a/b +' +test_expect_success 'iteration of dir w/ dir w/ a file' ' + cat >expected-out <<-EOF && + [d] (a) [a] ./dir15/a + [f] (a/b) [b] ./dir15/a/b + EOF + + test-tool dir-iterator ./dir15 >actual-out && + test_cmp expected-out actual-out +' + test_expect_success 'setup -- dir w/ complex structure' ' mkdir -p dir && mkdir -p dir/a/b/c/ && @@ -49,10 +140,178 @@ test_expect_success 'dir-iterator should list files in the correct order' ' EOF test-tool dir-iterator ./dir2 >actual-out && - test_cmp expected-out actual-out ' +test_expect_success POSIXPERM,SANITY \ +'setup -- dir w/ three nested dirs w/ file, second nested dir w/o perms' ' + + mkdir -p dir7/a/b/c && + >dir7/a/b/c/d +' +test_expect_success POSIXPERM,SANITY \ +'iteration of dir w/ three nested dirs w/ file, second w/o perms' ' + + cat >expected-out <<-EOF && + [d] (a) [a] ./dir7/a + [d] (a/b) [b] ./dir7/a/b + EOF + + chmod 0 dir7/a/b && + + test-tool dir-iterator ./dir7 >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir7/a/b +' +test_expect_success POSIXPERM,SANITY \ +'pedantic iteration of dir w/ three nested dirs w/ file, second w/o perms' ' + + cat >expected-out <<-EOF && + [d] (a) [a] ./dir7/a + [d] (a/b) [b] ./dir7/a/b + dir_iterator_advance failure: EACCES + EOF + + chmod 0 dir7/a/b && + + test_must_fail test-tool dir-iterator --pedantic ./dir7 >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir7/a/b +' + +test_expect_success 'setup -- dir w/ two dirs each w/ file' ' + mkdir -p dir8/a && + >dir8/a/b && + mkdir dir8/c && + >dir8/c/d +' +test_expect_success 'iteration of dir w/ two dirs each w/ file' ' + cat >expected-out1 <<-EOF && + [d] (a) [a] ./dir8/a + [f] (a/b) [b] ./dir8/a/b + [d] (c) [c] ./dir8/c + [f] (c/d) [d] ./dir8/c/d + EOF + cat >expected-out2 <<-EOF && + [d] (c) [c] ./dir8/c + [f] (c/d) [d] ./dir8/c/d + [d] (a) [a] ./dir8/a + [f] (a/b) [b] ./dir8/a/b + EOF + + test-tool dir-iterator ./dir8 >actual-out && + ( + test_cmp expected-out1 actual-out || + test_cmp expected-out2 actual-out + ) +' + +test_expect_success 'setup -- dir w/ two dirs, one w/ two and one w/ one files' ' + mkdir -p dir9/a && + >dir9/a/b && + >dir9/a/c && + mkdir dir9/d && + >dir9/d/e +' +test_expect_success \ +'iteration of dir w/ two dirs, one w/ two and one w/ one files' ' + + cat >expected-out1 <<-EOF && + [d] (a) [a] ./dir9/a + [f] (a/b) [b] ./dir9/a/b + [f] (a/c) [c] ./dir9/a/c + [d] (d) [d] ./dir9/d + [f] (d/e) [e] ./dir9/d/e + EOF + cat >expected-out2 <<-EOF && + [d] (a) [a] ./dir9/a + [f] (a/c) [c] ./dir9/a/c + [f] (a/b) [b] ./dir9/a/b + [d] (d) [d] ./dir9/d + [f] (d/e) [e] ./dir9/d/e + EOF + cat >expected-out3 <<-EOF && + [d] (d) [d] ./dir9/d + [f] (d/e) [e] ./dir9/d/e + [d] (a) [a] ./dir9/a + [f] (a/b) [b] ./dir9/a/b + [f] (a/c) [c] ./dir9/a/c + EOF + cat >expected-out4 <<-EOF && + [d] (d) [d] ./dir9/d + [f] (d/e) [e] ./dir9/d/e + [d] (a) [a] ./dir9/a + [f] (a/c) [c] ./dir9/a/c + [f] (a/b) [b] ./dir9/a/b + EOF + + test-tool dir-iterator ./dir9 >actual-out && + ( + test_cmp expected-out1 actual-out || + test_cmp expected-out2 actual-out || + test_cmp expected-out3 actual-out || + test_cmp expected-out4 actual-out + ) +' + +test_expect_success 'setup -- dir w/ two nested dirs, each w/ file' ' + mkdir -p dir10/a && + >dir10/a/b && + mkdir dir10/a/c && + >dir10/a/c/d +' +test_expect_success 'iteration of dir w/ two nested dirs, each w/ file' ' + cat >expected-out1 <<-EOF && + [d] (a) [a] ./dir10/a + [f] (a/b) [b] ./dir10/a/b + [d] (a/c) [c] ./dir10/a/c + [f] (a/c/d) [d] ./dir10/a/c/d + EOF + cat >expected-out2 <<-EOF && + [d] (a) [a] ./dir10/a + [d] (a/c) [c] ./dir10/a/c + [f] (a/c/d) [d] ./dir10/a/c/d + [f] (a/b) [b] ./dir10/a/b + EOF + + test-tool dir-iterator ./dir10/ >actual-out && + ( + test_cmp expected-out1 actual-out || + test_cmp expected-out2 actual-out + ) +' + +test_expect_success POSIXPERM,SANITY 'setup -- dir w/o perms' ' + mkdir -p dir12/a && + >dir12/a/b +' +test_expect_success POSIXPERM,SANITY 'iteration of root dir w/o perms' ' + cat >expected-out <<-EOF && + dir_iterator_advance failure: EACCES + EOF + + chmod 0 dir12 && + + test_must_fail test-tool dir-iterator ./dir12 >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir12 +' +test_expect_success POSIXPERM,SANITY 'pedantic iteration of root dir w/o perms' ' + cat >expected-out <<-EOF && + dir_iterator_advance failure: EACCES + EOF + + chmod 0 dir12 && + + test_must_fail test-tool dir-iterator --pedantic ./dir12 >actual-out && + test_cmp expected-out actual-out && + + chmod 755 dir12 +' + test_expect_success 'begin should fail upon inexistent paths' ' echo "dir_iterator_begin failure: ENOENT" >expected-out && @@ -147,5 +406,34 @@ test_expect_success SYMLINKS 'setup -- dir w/ symlinks w/ cycle' ' ln -s ../ dir5/a/b/e && ln -s ../../ dir5/a/b/f ' +test_expect_success SYMLINKS 'iteration of dir w/ symlinks w/ cycle' ' + + cat >expected-sorted-out <<-EOF && + [d] (a) [a] ./dir5/a + [d] (a/b) [b] ./dir5/a/b + [d] (a/c) [c] ./dir5/a/c + [s] (a/b/d) [d] ./dir5/a/b/d + [s] (a/b/e) [e] ./dir5/a/b/e + [s] (a/b/f) [f] ./dir5/a/b/f + EOF + + test-tool dir-iterator ./dir5 >actual-out && + sort actual-out >actual-sorted-out && + + test_cmp expected-sorted-out actual-sorted-out +' +test_expect_success SYMLINKS \ +'pedantic follow-symlinks iteration of dir w/ symlinks w/ cycle' ' + + cat >expected-tailed-out <<-EOF && + dir_iterator_advance failure: ELOOP + EOF + + test_must_fail test-tool dir-iterator \ + --pedantic --follow-symlinks ./dir5 >actual-out && + tail -n 1 actual-out >actual-tailed-out && + + test_cmp expected-tailed-out actual-tailed-out +' test_done -- 2.36.1
