From: Plato Kiorpelidis <kioplato@gmail.com>
To: git@vger.kernel.org
Cc: phillip.wood123@gmail.com, avarab@gmail.com,
Plato Kiorpelidis <kioplato@gmail.com>
Subject: [PATCH v2 09/15] t0066: rename test directories
Date: Mon, 9 May 2022 20:51:53 +0300 [thread overview]
Message-ID: <20220509175159.2948802-10-kioplato@gmail.com> (raw)
In-Reply-To: <20220509175159.2948802-1-kioplato@gmail.com>
Improve readability by renaming directories such that their name
correspond to the order they appear in the file. An out of order
naming could suggest that the directory naming plays some role
in how the tests are structured and performed, which is not true.
Signed-off-by: Plato Kiorpelidis <kioplato@gmail.com>
---
t/t0066-dir-iterator.sh | 198 ++++++++++++++++++++--------------------
1 file changed, 99 insertions(+), 99 deletions(-)
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
index 9b3ce99382..04e51928bc 100755
--- a/t/t0066-dir-iterator.sh
+++ b/t/t0066-dir-iterator.sh
@@ -19,96 +19,96 @@ test_expect_success 'iteration of dir with a file' '
'
test_expect_success 'setup -- dir with a single dir' '
- mkdir -p dir6/a
+ mkdir -p dir2/a
'
test_expect_success 'iteration of dir with a single dir' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir6/a
+ [d] (a) [a] ./dir2/a
EOF
- test-tool dir-iterator ./dir6 >actual-out &&
+ test-tool dir-iterator ./dir2 >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
+ mkdir -p dir3/a
'
test_expect_success POSIXPERM,SANITY 'iteration of dir w/ dir w/o perms' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir13/a
+ [d] (a) [a] ./dir3/a
EOF
- chmod 0 dir13/a &&
+ chmod 0 dir3/a &&
- test-tool dir-iterator ./dir13/ >actual-out &&
+ test-tool dir-iterator ./dir3/ >actual-out &&
test_cmp expected-out actual-out &&
- chmod 755 dir13/a
+ chmod 755 dir3/a
'
test_expect_success POSIXPERM,SANITY 'pedantic iteration of dir w/ dir w/o perms' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir13/a
+ [d] (a) [a] ./dir3/a
dir_iterator_advance failure: EACCES
EOF
- chmod 0 dir13/a &&
+ chmod 0 dir3/a &&
- test_must_fail test-tool dir-iterator --pedantic ./dir13/ >actual-out &&
+ test_must_fail test-tool dir-iterator --pedantic ./dir3/ >actual-out &&
test_cmp expected-out actual-out &&
- chmod 755 dir13/a
+ chmod 755 dir3/a
'
test_expect_success 'setup -- dir w/ five files' '
- mkdir dir14 &&
- >dir14/a &&
- >dir14/b &&
- >dir14/c &&
- >dir14/d &&
- >dir14/e
+ mkdir dir4 &&
+ >dir4/a &&
+ >dir4/b &&
+ >dir4/c &&
+ >dir4/d &&
+ >dir4/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
+ [f] (a) [a] ./dir4/a
+ [f] (b) [b] ./dir4/b
+ [f] (c) [c] ./dir4/c
+ [f] (d) [d] ./dir4/d
+ [f] (e) [e] ./dir4/e
EOF
- test-tool dir-iterator ./dir14 >actual-out &&
+ test-tool dir-iterator ./dir4 >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
+ mkdir -p dir5/a &&
+ >dir5/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
+ [d] (a) [a] ./dir5/a
+ [f] (a/b) [b] ./dir5/a/b
EOF
- test-tool dir-iterator ./dir15 >actual-out &&
+ test-tool dir-iterator ./dir5 >actual-out &&
test_cmp expected-out actual-out
'
test_expect_success 'setup -- dir w/ three nested dirs w/ file' '
- mkdir -p dir2/a/b/c &&
- >dir2/a/b/c/d
+ mkdir -p dir6/a/b/c &&
+ >dir6/a/b/c/d
'
test_expect_success 'dir-iterator should list files in the correct order' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir2/a
- [d] (a/b) [b] ./dir2/a/b
- [d] (a/b/c) [c] ./dir2/a/b/c
- [f] (a/b/c/d) [d] ./dir2/a/b/c/d
+ [d] (a) [a] ./dir6/a
+ [d] (a/b) [b] ./dir6/a/b
+ [d] (a/b/c) [c] ./dir6/a/b/c
+ [f] (a/b/c/d) [d] ./dir6/a/b/c/d
EOF
- test-tool dir-iterator ./dir2 >actual-out &&
+ test-tool dir-iterator ./dir6 >actual-out &&
test_cmp expected-out actual-out
'
@@ -253,31 +253,31 @@ test_expect_success 'iteration of dir w/ two nested dirs, each w/ file' '
'
test_expect_success 'setup -- dir w/ complex structure' '
- mkdir -p dir &&
- mkdir -p dir/a/b/c/ &&
- >dir/b &&
- >dir/c &&
- mkdir -p dir/d/e/d/ &&
- >dir/a/b/c/d &&
- >dir/a/e &&
- >dir/d/e/d/a
+ mkdir -p dir11 &&
+ mkdir -p dir11/a/b/c/ &&
+ >dir11/b &&
+ >dir11/c &&
+ mkdir -p dir11/d/e/d/ &&
+ >dir11/a/b/c/d &&
+ >dir11/a/e &&
+ >dir11/d/e/d/a
'
test_expect_success 'dir-iterator should iterate through all files' '
cat >expected-sorted-out <<-EOF &&
- [d] (a) [a] ./dir/a
- [d] (a/b) [b] ./dir/a/b
- [d] (a/b/c) [c] ./dir/a/b/c
- [d] (d) [d] ./dir/d
- [d] (d/e) [e] ./dir/d/e
- [d] (d/e/d) [d] ./dir/d/e/d
- [f] (a/b/c/d) [d] ./dir/a/b/c/d
- [f] (a/e) [e] ./dir/a/e
- [f] (b) [b] ./dir/b
- [f] (c) [c] ./dir/c
- [f] (d/e/d/a) [a] ./dir/d/e/d/a
+ [d] (a) [a] ./dir11/a
+ [d] (a/b) [b] ./dir11/a/b
+ [d] (a/b/c) [c] ./dir11/a/b/c
+ [d] (d) [d] ./dir11/d
+ [d] (d/e) [e] ./dir11/d/e
+ [d] (d/e/d) [d] ./dir11/d/e/d
+ [f] (a/b/c/d) [d] ./dir11/a/b/c/d
+ [f] (a/e) [e] ./dir11/a/e
+ [f] (b) [b] ./dir11/b
+ [f] (c) [c] ./dir11/c
+ [f] (d/e/d/a) [a] ./dir11/d/e/d/a
EOF
- test-tool dir-iterator ./dir >actual-out &&
+ test-tool dir-iterator ./dir11 >actual-out &&
sort actual-out >actual-sorted-out &&
test_cmp expected-sorted-out actual-sorted-out
@@ -331,93 +331,93 @@ test_expect_success 'begin should fail upon non directory paths' '
'
test_expect_success POSIXPERM,SANITY 'setup -- dir w/ dir w/o perms w/ file' '
- mkdir -p dir3/a &&
- >dir3/a/b
+ mkdir -p dir13/a &&
+ >dir13/a/b
'
test_expect_success POSIXPERM,SANITY 'advance should not fail on errors by default' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir3/a
+ [d] (a) [a] ./dir13/a
EOF
- chmod 0 dir3/a &&
+ chmod 0 dir13/a &&
- test-tool dir-iterator ./dir3 >actual-out &&
+ test-tool dir-iterator ./dir13 >actual-out &&
test_cmp expected-out actual-out &&
- chmod 755 dir3/a
+ chmod 755 dir13/a
'
test_expect_success POSIXPERM,SANITY 'advance should fail on errors, w/ pedantic flag' '
cat >expected-out <<-EOF &&
- [d] (a) [a] ./dir3/a
+ [d] (a) [a] ./dir13/a
dir_iterator_advance failure: EACCES
EOF
- chmod 0 dir3/a &&
+ chmod 0 dir13/a &&
- test_must_fail test-tool dir-iterator --pedantic ./dir3 >actual-out &&
+ test_must_fail test-tool dir-iterator --pedantic ./dir13 >actual-out &&
test_cmp expected-out actual-out &&
- chmod 755 dir3/a
+ chmod 755 dir13/a
'
test_expect_success SYMLINKS 'setup -- dir w/ symlinks w/o cycle' '
- mkdir -p dir4/a &&
- mkdir -p dir4/b/c &&
- >dir4/a/d &&
- ln -s d dir4/a/e &&
- ln -s ../b dir4/a/f
+ mkdir -p dir14/a &&
+ mkdir -p dir14/b/c &&
+ >dir14/a/d &&
+ ln -s d dir14/a/e &&
+ ln -s ../b dir14/a/f
'
test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default' '
cat >expected-sorted-out <<-EOF &&
- [d] (a) [a] ./dir4/a
- [d] (b) [b] ./dir4/b
- [d] (b/c) [c] ./dir4/b/c
- [f] (a/d) [d] ./dir4/a/d
- [s] (a/e) [e] ./dir4/a/e
- [s] (a/f) [f] ./dir4/a/f
+ [d] (a) [a] ./dir14/a
+ [d] (b) [b] ./dir14/b
+ [d] (b/c) [c] ./dir14/b/c
+ [f] (a/d) [d] ./dir14/a/d
+ [s] (a/e) [e] ./dir14/a/e
+ [s] (a/f) [f] ./dir14/a/f
EOF
- test-tool dir-iterator ./dir4 >actual-out &&
+ test-tool dir-iterator ./dir14 >actual-out &&
sort actual-out >actual-sorted-out &&
test_cmp expected-sorted-out actual-sorted-out
'
test_expect_success SYMLINKS 'dir-iterator should follow symlinks w/ follow flag' '
cat >expected-sorted-out <<-EOF &&
- [d] (a) [a] ./dir4/a
- [d] (a/f) [f] ./dir4/a/f
- [d] (a/f/c) [c] ./dir4/a/f/c
- [d] (b) [b] ./dir4/b
- [d] (b/c) [c] ./dir4/b/c
- [f] (a/d) [d] ./dir4/a/d
- [f] (a/e) [e] ./dir4/a/e
+ [d] (a) [a] ./dir14/a
+ [d] (a/f) [f] ./dir14/a/f
+ [d] (a/f/c) [c] ./dir14/a/f/c
+ [d] (b) [b] ./dir14/b
+ [d] (b/c) [c] ./dir14/b/c
+ [f] (a/d) [d] ./dir14/a/d
+ [f] (a/e) [e] ./dir14/a/e
EOF
- test-tool dir-iterator --follow-symlinks ./dir4 >actual-out &&
+ test-tool dir-iterator --follow-symlinks ./dir14 >actual-out &&
sort actual-out >actual-sorted-out &&
test_cmp expected-sorted-out actual-sorted-out
'
test_expect_success SYMLINKS 'setup -- dir w/ symlinks w/ cycle' '
- mkdir -p dir5/a/b &&
- mkdir -p dir5/a/c &&
- ln -s ../c dir5/a/b/d &&
- ln -s ../ dir5/a/b/e &&
- ln -s ../../ dir5/a/b/f
+ mkdir -p dir15/a/b &&
+ mkdir -p dir15/a/c &&
+ ln -s ../c dir15/a/b/d &&
+ ln -s ../ dir15/a/b/e &&
+ ln -s ../../ dir15/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
+ [d] (a) [a] ./dir15/a
+ [d] (a/b) [b] ./dir15/a/b
+ [d] (a/c) [c] ./dir15/a/c
+ [s] (a/b/d) [d] ./dir15/a/b/d
+ [s] (a/b/e) [e] ./dir15/a/b/e
+ [s] (a/b/f) [f] ./dir15/a/b/f
EOF
- test-tool dir-iterator ./dir5 >actual-out &&
+ test-tool dir-iterator ./dir15 >actual-out &&
sort actual-out >actual-sorted-out &&
test_cmp expected-sorted-out actual-sorted-out
@@ -430,7 +430,7 @@ test_expect_success SYMLINKS \
EOF
test_must_fail test-tool dir-iterator \
- --pedantic --follow-symlinks ./dir5 >actual-out &&
+ --pedantic --follow-symlinks ./dir15 >actual-out &&
tail -n 1 actual-out >actual-tailed-out &&
test_cmp expected-tailed-out actual-tailed-out
--
2.36.1
next prev parent reply other threads:[~2022-05-09 17:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 17:51 [PATCH v2 00/15][GSoC] iterate dirs before or after their contents Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 01/15] t0066: refactor dir-iterator tests Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 02/15] t0066: remove dependency between unrelated tests Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 03/15] t0066: shorter expected and actual output file names Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 04/15] test-dir-iterator: consistently return EXIT_FAILURE or EXIT_SUCCESS Plato Kiorpelidis
2022-05-09 21:03 ` Junio C Hamano
2022-05-18 14:13 ` Plato Kiorpelidis
2022-05-18 17:57 ` Junio C Hamano
2022-05-09 17:51 ` [PATCH v2 05/15] test-dir-iterator: print EACCES and ELOOP errno set by dir_iterator Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 06/15] test-dir-iterator: print errno name set by dir_iterator_advance Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 07/15] t0066: better test coverage for dir-iterator Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 08/15] t0066: reorder tests from simple to more complex Plato Kiorpelidis
2022-05-09 17:51 ` Plato Kiorpelidis [this message]
2022-05-09 17:51 ` [PATCH v2 10/15] dir-iterator: refactor dir_iterator_advance() Plato Kiorpelidis
2022-05-09 21:16 ` Junio C Hamano
2022-05-18 15:39 ` Plato Kiorpelidis
2022-05-10 13:04 ` Phillip Wood
2022-05-09 17:51 ` [PATCH v2 11/15] dir-iterator: open root dir in dir_iterator_begin() Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 12/15] t0066: rename subtest descriptions Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 13/15] dir-iterator: option to iterate dirs in pre-order Plato Kiorpelidis
2022-05-10 13:07 ` Phillip Wood
2022-05-18 17:40 ` Plato Kiorpelidis
2022-05-18 17:47 ` rsbecker
2022-05-18 18:09 ` Junio C Hamano
2022-05-18 18:36 ` rsbecker
2022-05-09 17:51 ` [PATCH v2 14/15] dir-iterator: option to iterate dirs in post-order Plato Kiorpelidis
2022-05-09 17:51 ` [PATCH v2 15/15] entry.c: use dir-iterator to avoid explicit dir traversal Plato Kiorpelidis
2022-05-10 13:10 ` Phillip Wood
2022-05-10 13:13 ` [PATCH v2 00/15][GSoC] iterate dirs before or after their contents Phillip Wood
2022-05-10 16:31 ` Junio C Hamano
2022-05-20 17:43 ` Plato Kiorpelidis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220509175159.2948802-10-kioplato@gmail.com \
--to=kioplato@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).