From: Johannes Sixt <j6t@kdbg.org>
To: William Chargin <wchargin@gmail.com>
Cc: jrnieder@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH v2] t/test-lib: make `test_dir_is_empty` more robust
Date: Sun, 5 Aug 2018 10:34:40 +0200 [thread overview]
Message-ID: <ae85fef4-19f6-39a8-e680-3d08e74ecd5e@kdbg.org> (raw)
In-Reply-To: <20180805042031.20447-1-wchargin@gmail.com>
Am 05.08.2018 um 06:20 schrieb William Chargin:
> While the `test_dir_is_empty` function appears correct in most normal
> use cases, it can fail when filenames contain newlines. This patch
> changes the implementation to use `ls -A`, which is specified by POSIX.
> The output should be empty exactly if the directory is empty.
>
> The newly added unit test fails before this change and passes after it.
>
> Signed-off-by: William Chargin <wchargin@gmail.com>
> ---
>
> I originally wrote this patch for the standalone Sharness library, but
> that library advises that such patches be sent to the Git mailing list
> first.
>
> t/t0000-basic.sh | 29 +++++++++++++++++++++++++++++
> t/test-lib-functions.sh | 2 +-
> 2 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
> index 34859fe4a..3885b26f9 100755
> --- a/t/t0000-basic.sh
> +++ b/t/t0000-basic.sh
> @@ -821,6 +821,35 @@ test_expect_success 'tests clean up even on failures' "
> EOF
> "
>
> +test_expect_success 'test_dir_is_empty behaves even in pathological cases' "
> + run_sub_test_lib_test \
> + dir-empty 'behavior of test_dir_is_empty' <<-\\EOF &&
> + test_expect_success 'should pass with actually empty directory' '
> + mkdir empty_dir &&
> + test_dir_is_empty empty_dir
> + '
> + test_expect_success 'should fail with a normal filename' '
> + mkdir nonempty_dir &&
> + touch nonempty_dir/some_file &&
> + test_must_fail test_dir_is_empty nonempty_dir
> + '
> + test_expect_success 'should fail with dot-newline-dot filename' '
> + mkdir pathological_dir &&
> + printf \"pathological_dir/.\\\\n.\\\\0\" | xargs -0 touch &&
> + test_must_fail test_dir_is_empty pathological_dir
> + '
> + test_done
> + EOF
> + check_sub_test_lib_test dir-empty <<-\\EOF
> + > ok 1 - should pass with actually empty directory
> + > ok 2 - should fail with a normal filename
> + > ok 3 - should fail with dot-newline-dot filename
> + > # passed all 3 test(s)
> + > 1..3
> + EOF
> +"
> +
> +
> ################################################################
> # Basics of the basics
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 2b2181dca..f7ff28ef6 100644
> --- a/t/test-lib-functions.sh
> +++ b/t/test-lib-functions.sh
> @@ -568,7 +568,7 @@ test_path_is_dir () {
> # Check if the directory exists and is empty as expected, barf otherwise.
> test_dir_is_empty () {
> test_path_is_dir "$1" &&
> - if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
> + if test "$(ls -A1 "$1" | wc -c)" != 0
> then
> echo "Directory '$1' is not empty, it contains:"
> ls -la "$1"
>
Did you accidentally resend the same patch in this v2? I can't spot the
difference to v1.
-- Hannes
prev parent reply other threads:[~2018-08-05 8:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-05 2:20 [PATCH 0/1] t/test-lib: make `test_dir_is_empty` more robust William Chargin
2018-08-05 2:20 ` [PATCH 1/1] " William Chargin
2018-08-05 4:19 ` Jonathan Nieder
2018-08-05 5:23 ` Eric Sunshine
2018-08-05 20:52 ` Jeff King
2018-08-06 13:02 ` Jeff King
2018-08-06 17:52 ` Eric Sunshine
2018-08-12 4:06 ` [PATCH v3] test_dir_is_empty: properly detect files with newline in name William Chargin
2018-08-12 6:17 ` Eric Sunshine
2018-08-12 6:32 ` William Chargin
2018-08-12 6:44 ` Eric Sunshine
2018-09-12 18:35 ` [PATCH v4] test_dir_is_empty: fix edge cases with newlines and hyphens William Chargin
2018-09-12 19:50 ` Junio C Hamano
2018-09-12 18:37 ` William Chargin
2018-08-12 4:06 ` [PATCH 1/1] t/test-lib: make `test_dir_is_empty` more robust William Chargin
2018-08-05 5:24 ` William Chargin
2018-08-05 6:34 ` Jonathan Nieder
2018-08-05 6:03 ` Junio C Hamano
2018-08-05 6:23 ` Jonathan Nieder
2018-08-05 3:36 ` [PATCH 0/1] " Jonathan Nieder
2018-08-05 4:19 ` William Chargin
2018-08-05 4:20 ` [PATCH v2] " William Chargin
2018-08-05 8:34 ` Johannes Sixt [this message]
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=ae85fef4-19f6-39a8-e680-3d08e74ecd5e@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=wchargin@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).