From: shejialuo <shejialuo@gmail.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>,
shejialuo <shejialuo@gmail.com>
Subject: [PATCH 1/1] t9117: prefer test_path_* helper functions
Date: Fri, 1 Mar 2024 11:46:06 +0800 [thread overview]
Message-ID: <20240301034606.69673-2-shejialuo@gmail.com> (raw)
In-Reply-To: <20240301034606.69673-1-shejialuo@gmail.com>
test -(e|f|d) does not provide a nice error message when we hit test
failures, so use test_path_exists, test_path_is_dir and
test_path_is_file instead.
Signed-off-by: shejialuo <shejialuo@gmail.com>
---
t/t9117-git-svn-init-clone.sh | 40 +++++++++++++++++------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
index 62de819a44..2f964f66aa 100755
--- a/t/t9117-git-svn-init-clone.sh
+++ b/t/t9117-git-svn-init-clone.sh
@@ -15,39 +15,39 @@ test_expect_success 'setup svnrepo' '
'
test_expect_success 'basic clone' '
- test ! -d trunk &&
+ ! test_path_is_dir trunk &&
git svn clone "$svnrepo"/project/trunk &&
- test -d trunk/.git/svn &&
- test -e trunk/foo &&
+ test_path_is_dir trunk/.git/svn &&
+ test_path_exists trunk/foo &&
rm -rf trunk
'
test_expect_success 'clone to target directory' '
- test ! -d target &&
+ ! test_path_is_dir target &&
git svn clone "$svnrepo"/project/trunk target &&
- test -d target/.git/svn &&
- test -e target/foo &&
+ test_path_is_dir target/.git/svn &&
+ test_path_exists target/foo &&
rm -rf target
'
test_expect_success 'clone with --stdlayout' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn clone -s "$svnrepo"/project &&
- test -d project/.git/svn &&
- test -e project/foo &&
+ test_path_is_dir project/.git/svn &&
+ test_path_exists project/foo &&
rm -rf project
'
test_expect_success 'clone to target directory with --stdlayout' '
- test ! -d target &&
+ ! test_path_is_dir target &&
git svn clone -s "$svnrepo"/project target &&
- test -d target/.git/svn &&
- test -e target/foo &&
+ test_path_is_dir target/.git/svn &&
+ test_path_exists target/foo &&
rm -rf target
'
test_expect_success 'init without -s/-T/-b/-t does not warn' '
- test ! -d trunk &&
+ ! test_path_is_dir trunk &&
git svn init "$svnrepo"/project/trunk trunk 2>warning &&
! grep -q prefix warning &&
rm -rf trunk &&
@@ -55,7 +55,7 @@ test_expect_success 'init without -s/-T/-b/-t does not warn' '
'
test_expect_success 'clone without -s/-T/-b/-t does not warn' '
- test ! -d trunk &&
+ ! test_path_is_dir trunk &&
git svn clone "$svnrepo"/project/trunk 2>warning &&
! grep -q prefix warning &&
rm -rf trunk &&
@@ -69,7 +69,7 @@ project/trunk:refs/remotes/${prefix}trunk
project/branches/*:refs/remotes/${prefix}*
project/tags/*:refs/remotes/${prefix}tags/*
EOF
- test ! -f actual &&
+ ! test_path_is_file actual &&
git --git-dir=project/.git config svn-remote.svn.fetch >>actual &&
git --git-dir=project/.git config svn-remote.svn.branches >>actual &&
git --git-dir=project/.git config svn-remote.svn.tags >>actual &&
@@ -78,7 +78,7 @@ EOF
}
test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn init -s "$svnrepo"/project project 2>warning &&
! grep -q prefix warning &&
test_svn_configured_prefix "origin/" &&
@@ -87,7 +87,7 @@ test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
'
test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn clone -s "$svnrepo"/project 2>warning &&
! grep -q prefix warning &&
test_svn_configured_prefix "origin/" &&
@@ -96,7 +96,7 @@ test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
'
test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
! grep -q prefix warning &&
test_svn_configured_prefix "" &&
@@ -105,7 +105,7 @@ test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
'
test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
! grep -q prefix warning &&
test_svn_configured_prefix "" &&
@@ -114,7 +114,7 @@ test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
'
test_expect_success 'init with -T as a full url works' '
- test ! -d project &&
+ ! test_path_is_dir project &&
git svn init -T "$svnrepo"/project/trunk project &&
rm -rf project
'
--
2.44.0
next prev parent reply other threads:[~2024-03-01 3:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 15:04 [GSoC][PATCH 0/1] microproject: Use test_path_is_* functions in test scripts shejialuo
2024-02-29 15:04 ` [PATCH 1/1] [GSoC][PATCH] t3070: refactor test -e command shejialuo
2024-02-29 17:58 ` Eric Sunshine
2024-02-29 19:06 ` Junio C Hamano
2024-03-04 9:16 ` [PATCH] SoC 2024: clarify `test_path_is_*` conversion microproject Patrick Steinhardt
2024-03-04 13:42 ` Christian Couder
2024-03-04 17:02 ` Junio C Hamano
2024-03-04 9:17 ` [PATCH 1/1] [GSoC][PATCH] t3070: refactor test -e command Patrick Steinhardt
2024-03-01 2:50 ` shejialuo
2024-03-01 3:46 ` [PATCH V2 0/1] [GSoC][PATCH] t9117: prefer test_path_* helper functions shejialuo
2024-03-01 3:46 ` shejialuo [this message]
2024-03-01 4:44 ` [PATCH 1/1] " Eric Sunshine
2024-03-01 11:29 ` shejialuo
2024-03-01 5:09 ` Junio C Hamano
2024-03-01 11:36 ` shejialuo
2024-03-01 13:03 ` [PATCH v3 0/1] " shejialuo
2024-03-01 13:03 ` [PATCH v3 1/1] [PATCH] " shejialuo
2024-03-04 9:24 ` Patrick Steinhardt
2024-03-04 9:54 ` [PATCH v4 0/1] Change commit message shejialuo
2024-03-04 9:54 ` [PATCH v4 1/1] [PATCH] t9117: prefer test_path_* helper functions shejialuo
2024-03-04 9:59 ` Patrick Steinhardt
2024-03-04 11:45 ` shejialuo
2024-03-04 17:50 ` Junio C Hamano
2024-03-04 17:22 ` Junio C Hamano
2024-03-05 11:42 ` shejialuo
2024-03-04 17:19 ` [PATCH v4 0/1] Change commit message Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240301034606.69673-2-shejialuo@gmail.com \
--to=shejialuo@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.