From: COGONI Guillaume <cogoni.guillaume@gmail.com>
To: gitster@pobox.com
Cc: avarab@gmail.com, cogoni.guillaume@gmail.com,
git.jonathan.bressat@gmail.com, git@vger.kernel.org,
guillaume.cogoni@gmail.com, matthieu.moy@univ-lyon1.fr
Subject: [PATCH v3 0/3] replace test [-f|-d] with more verbose functions
Date: Tue, 22 Feb 2022 22:54:27 +0100 [thread overview]
Message-ID: <20220222215430.605254-1-cogoni.guillaume@gmail.com> (raw)
In-Reply-To: <xmqqbkz4105s.fsf@gitster.g>
Make the code more readable in t/t3903-stash.sh and give more
friendly error message by replacing test [-f|-d] by the right
test_path_is_* functions.
Add new functions like test_path_is_* to cover more specifics
cases like symbolic link or file that we explicitly refuse
to be symbolic link.
> On 18/11/2022, Junio C Hamano wrote:
> The "ls -l" parsing the original does is to check how "stash apply"
> recovers the stashed state, where "file" wants to be a symbolic link
> and it wants to be pointing at "file2".
> It seems we have test_readlink() available these days, so with a
> separate clean-up patch, you may want to make the final version
> to read something like this, perhaps?
> I am not sure what test_readlink which is a one-liner Perl script
> does when it is fed a non symbolic link, so I do not know if the
> "path is truly a file and not a symlink"
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
Firstly, we check if file is a symbolic link then if it is a symbolic link
on file2.
We check if it is a symbolic link because test_readlink() raise an error
if we give it something that is not a symbolic link and this error is less
readable.
> Why not
> if test -h "$1"
> instead??? I think "is truly a dir not a symlink" has the same
> "Huh?" puzzle.
We fixed it.
COGONI Guillaume (3):
t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*
tests: allow testing if a path is truly a file or a directory
tests: make the code more readable
t/t3903-stash.sh | 21 ++++++++++++---------
t/test-lib-functions.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 9 deletions(-)
Difference between V2 and V3.
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 0ec19a4499..d5ecee4fcc 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -392,7 +392,9 @@ test_expect_success SYMLINKS 'stash file to symlink' '
git stash save "file to symlink" &&
test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply
+ git stash apply &&
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
@@ -402,7 +404,9 @@ test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
git stash save "file to symlink (stage rm)" &&
test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply
+ git stash apply &&
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
@@ -413,7 +417,9 @@ test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
git stash save "file to symlink (full stage)" &&
test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply
+ git stash apply &&
+ test_path_is_symlink file &&
+ test "$(test_readlink file)" = file2
'
# This test creates a commit with a symlink used for the following tests
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 61fc5f37e3..0f439c99d6 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -859,9 +859,9 @@ test_path_is_file () {
test_path_is_file_not_symlink () {
test "$#" -ne 1 && BUG "1 param"
test_path_is_file "$1" &&
- if ! test ! -h "$1"
+ if test -h "$1"
then
- echo "$1 is a symbolic link"
+ echo "$1 shouldn't be a symbolic link"
false
fi
}
@@ -878,9 +878,9 @@ test_path_is_dir () {
test_path_is_dir_not_symlink () {
test "$#" -ne 1 && BUG "1 param"
test_path_is_dir "$1" &&
- if ! test ! -h "$1"
+ if test -h "$1"
then
- echo "$1 is a symbolic link"
+ echo "$1 shouldn't be a symbolic link"
false
fi
}
@@ -894,6 +894,15 @@ test_path_exists () {
fi
}
+test_path_is_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ if ! test -h "$1"
+ then
+ echo "Symbolic link $1 doesn't exist"
+ false
+ fi
+}
+
--
2.25.1
next prev parent reply other threads:[~2022-02-22 21:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 13:46 [PATCH] t/t3903-stash.sh: replace test [-d|-f] with test_path_is_* COGONI Guillaume
2022-02-11 18:02 ` Junio C Hamano
2022-02-14 20:22 ` Cogoni Guillaume
2022-02-15 22:13 ` Ævar Arnfjörð Bjarmason
2022-02-18 17:10 ` [PATCH v2 0/2] replace test [-f|-d] with more verbose functions COGONI Guillaume
2022-02-18 17:12 ` COGONI Guillaume
2022-02-18 17:12 ` [PATCH v2 1/2] t/t3903-stash.sh: replace test [-d|-f] with test_path_is_* COGONI Guillaume
2022-02-18 17:12 ` [PATCH v2 2/2] Add new tests functions like test_path_is_* COGONI Guillaume
2022-02-18 18:48 ` Junio C Hamano
2022-02-22 21:54 ` COGONI Guillaume [this message]
2022-02-22 21:54 ` [PATCH v3 1/3] t/t3903-stash.sh: replace test [-d|-f] with test_path_is_* COGONI Guillaume
2022-02-22 21:54 ` [PATCH v3 2/3] tests: allow testing if a path is truly a file or a directory COGONI Guillaume
2022-02-22 21:54 ` [PATCH v3 3/3] tests: make the code more readable COGONI Guillaume
2022-02-23 22:59 ` [PATCH v3 0/3] replace test [-f|-d] with more verbose functions Junio C Hamano
2022-02-24 18:22 ` Cogoni Guillaume
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=20220222215430.605254-1-cogoni.guillaume@gmail.com \
--to=cogoni.guillaume@gmail.com \
--cc=avarab@gmail.com \
--cc=git.jonathan.bressat@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.cogoni@gmail.com \
--cc=matthieu.moy@univ-lyon1.fr \
/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).