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 08/15] t0066: reorder tests from simple to more complex
Date: Mon, 9 May 2022 20:51:52 +0300 [thread overview]
Message-ID: <20220509175159.2948802-9-kioplato@gmail.com> (raw)
In-Reply-To: <20220509175159.2948802-1-kioplato@gmail.com>
Gradually increase the complexity of the tests. This reordering helps
when testing dir-iterator, explicitly or by running the full test suite.
In case a test fails it provides additional aid searching for and finding
the part of dir-iterator that causes the test to fail, making it easier.
Signed-off-by: Plato Kiorpelidis <kioplato@gmail.com>
---
t/t0066-dir-iterator.sh | 62 ++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
index 932b1f291c..9b3ce99382 100755
--- a/t/t0066-dir-iterator.sh
+++ b/t/t0066-dir-iterator.sh
@@ -96,37 +96,6 @@ test_expect_success 'iteration of dir w/ dir w/ a file' '
test_cmp expected-out actual-out
'
-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
-'
-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
- EOF
-
- test-tool dir-iterator ./dir >actual-out &&
- sort actual-out >actual-sorted-out &&
-
- test_cmp expected-sorted-out actual-sorted-out
-'
-
test_expect_success 'setup -- dir w/ three nested dirs w/ file' '
mkdir -p dir2/a/b/c &&
>dir2/a/b/c/d
@@ -283,6 +252,37 @@ 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
+'
+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
+ EOF
+
+ test-tool dir-iterator ./dir >actual-out &&
+ sort actual-out >actual-sorted-out &&
+
+ test_cmp expected-sorted-out actual-sorted-out
+'
+
test_expect_success POSIXPERM,SANITY 'setup -- dir w/o perms' '
mkdir -p dir12/a &&
>dir12/a/b
--
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 ` Plato Kiorpelidis [this message]
2022-05-09 17:51 ` [PATCH v2 09/15] t0066: rename test directories Plato Kiorpelidis
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-9-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).