From: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
The helper functions test_path_is_* provide better debugging
information than test -d/-e/-f.
Replace "! test -d" with "test_path_is_missing" at places where
we check for non-existent directories.
Replace "test -f" with "test_path_is_file" and "test -d" with
"test_path_is_dir" at places where we expect files or directories
to exist.
Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
---
t9146: replace test -d/-f with appropriate test_path_is_* function
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1661%2FChand-ra%2Ftestfix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1661/Chand-ra/testfix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1661
t/t9146-git-svn-empty-dirs.sh | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 09606f1b3cf..532f5baa208 100755
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -20,7 +20,7 @@ test_expect_success 'empty directories exist' '
cd cloned &&
for i in a b c d d/e d/e/f "weird file name"
do
- if ! test -d "$i"
+ if test_path_is_missing "$i"
then
echo >&2 "$i does not exist" &&
exit 1
@@ -37,7 +37,7 @@ test_expect_success 'option automkdirs set to false' '
git svn fetch &&
for i in a b c d d/e d/e/f "weird file name"
do
- if test -d "$i"
+ if test_path_is_dir "$i"
then
echo >&2 "$i exists" &&
exit 1
@@ -52,7 +52,7 @@ test_expect_success 'more emptiness' '
test_expect_success 'git svn rebase creates empty directory' '
( cd cloned && git svn rebase ) &&
- test -d cloned/"! !"
+ test_path_is_dir cloned/"! !"
'
test_expect_success 'git svn mkdirs recreates empty directories' '
@@ -62,7 +62,7 @@ test_expect_success 'git svn mkdirs recreates empty directories' '
git svn mkdirs &&
for i in a b c d d/e d/e/f "weird file name" "! !"
do
- if ! test -d "$i"
+ if test_path_is_missing "$i"
then
echo >&2 "$i does not exist" &&
exit 1
@@ -78,21 +78,21 @@ test_expect_success 'git svn mkdirs -r works' '
git svn mkdirs -r7 &&
for i in a b c d d/e d/e/f "weird file name"
do
- if ! test -d "$i"
+ if test_path_is_missing "$i"
then
echo >&2 "$i does not exist" &&
exit 1
fi
done &&
- if test -d "! !"
+ if test_path_is_dir "! !"
then
echo >&2 "$i should not exist" &&
exit 1
fi &&
git svn mkdirs -r8 &&
- if ! test -d "! !"
+ if test_path_is_missing "! !"
then
echo >&2 "$i not exist" &&
exit 1
@@ -114,7 +114,7 @@ test_expect_success 'empty directories in trunk exist' '
cd trunk &&
for i in a "weird file name"
do
- if ! test -d "$i"
+ if test_path_is_missing "$i"
then
echo >&2 "$i does not exist" &&
exit 1
@@ -138,16 +138,16 @@ test_expect_success 'git svn gc-ed files work' '
cd removed &&
git svn gc &&
: Compress::Zlib may not be available &&
- if test -f "$unhandled".gz
+ if test_path_is_file "$unhandled".gz
then
svn_cmd mkdir -m gz "$svnrepo"/gz &&
git reset --hard $(git rev-list HEAD | tail -1) &&
git svn rebase &&
- test -f "$unhandled".gz &&
- test -f "$unhandled" &&
+ test_path_is_file "$unhandled".gz &&
+ test_path_is_file "$unhandled" &&
for i in a b c "weird file name" gz "! !"
do
- if ! test -d "$i"
+ if test_path_is_missing "$i"
then
echo >&2 "$i does not exist" &&
exit 1
base-commit: 235986be822c9f8689be2e9a0b7804d0b1b6d821
--
gitgitgadget
