mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
t9146: replace test -d/-e/-f with appropriate test_path_is_* function
The helper functions test_path_is_* provide better debugging information than test -d/-e/-f. Replace "if ! test -d then <error message>" and "test -d" with "test_path_is_dir" at places where we check for existent directories. Replace "test -f" with "test_path_is_file" at places where we check for existent files. Replace "test ! -e" and "if test -d then <error message>" with "test_path_is_missing" where we check for non-existent directories. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
efb050becb
commit
c431a235e2
1 changed files with 12 additions and 44 deletions
|
@ -20,11 +20,7 @@ test_expect_success 'empty directories exist' '
|
||||||
cd cloned &&
|
cd cloned &&
|
||||||
for i in a b c d d/e d/e/f "weird file name"
|
for i in a b c d d/e d/e/f "weird file name"
|
||||||
do
|
do
|
||||||
if ! test -d "$i"
|
test_path_is_dir "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i does not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
@ -37,11 +33,7 @@ test_expect_success 'option automkdirs set to false' '
|
||||||
git svn fetch &&
|
git svn fetch &&
|
||||||
for i in a b c d d/e d/e/f "weird file name"
|
for i in a b c d d/e d/e/f "weird file name"
|
||||||
do
|
do
|
||||||
if test -d "$i"
|
test_path_is_missing "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i exists" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
@ -52,7 +44,7 @@ test_expect_success 'more emptiness' '
|
||||||
|
|
||||||
test_expect_success 'git svn rebase creates empty directory' '
|
test_expect_success 'git svn rebase creates empty directory' '
|
||||||
( cd cloned && git svn rebase ) &&
|
( cd cloned && git svn rebase ) &&
|
||||||
test -d cloned/"! !"
|
test_path_is_dir cloned/"! !"
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'git svn mkdirs recreates empty directories' '
|
test_expect_success 'git svn mkdirs recreates empty directories' '
|
||||||
|
@ -62,11 +54,7 @@ test_expect_success 'git svn mkdirs recreates empty directories' '
|
||||||
git svn mkdirs &&
|
git svn mkdirs &&
|
||||||
for i in a b c d d/e d/e/f "weird file name" "! !"
|
for i in a b c d d/e d/e/f "weird file name" "! !"
|
||||||
do
|
do
|
||||||
if ! test -d "$i"
|
test_path_is_dir "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i does not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
@ -78,25 +66,13 @@ test_expect_success 'git svn mkdirs -r works' '
|
||||||
git svn mkdirs -r7 &&
|
git svn mkdirs -r7 &&
|
||||||
for i in a b c d d/e d/e/f "weird file name"
|
for i in a b c d d/e d/e/f "weird file name"
|
||||||
do
|
do
|
||||||
if ! test -d "$i"
|
test_path_is_dir "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i does not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done &&
|
done &&
|
||||||
|
|
||||||
if test -d "! !"
|
test_path_is_missing "! !" || exit 1 &&
|
||||||
then
|
|
||||||
echo >&2 "$i should not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi &&
|
|
||||||
|
|
||||||
git svn mkdirs -r8 &&
|
git svn mkdirs -r8 &&
|
||||||
if ! test -d "! !"
|
test_path_is_dir "! !" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
@ -114,11 +90,7 @@ test_expect_success 'empty directories in trunk exist' '
|
||||||
cd trunk &&
|
cd trunk &&
|
||||||
for i in a "weird file name"
|
for i in a "weird file name"
|
||||||
do
|
do
|
||||||
if ! test -d "$i"
|
test_path_is_dir "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i does not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
@ -129,7 +101,7 @@ test_expect_success 'remove a top-level directory from svn' '
|
||||||
|
|
||||||
test_expect_success 'removed top-level directory does not exist' '
|
test_expect_success 'removed top-level directory does not exist' '
|
||||||
git svn clone "$svnrepo" removed &&
|
git svn clone "$svnrepo" removed &&
|
||||||
test ! -e removed/d
|
test_path_is_missing removed/d
|
||||||
|
|
||||||
'
|
'
|
||||||
unhandled=.git/svn/refs/remotes/git-svn/unhandled.log
|
unhandled=.git/svn/refs/remotes/git-svn/unhandled.log
|
||||||
|
@ -143,15 +115,11 @@ test_expect_success 'git svn gc-ed files work' '
|
||||||
svn_cmd mkdir -m gz "$svnrepo"/gz &&
|
svn_cmd mkdir -m gz "$svnrepo"/gz &&
|
||||||
git reset --hard $(git rev-list HEAD | tail -1) &&
|
git reset --hard $(git rev-list HEAD | tail -1) &&
|
||||||
git svn rebase &&
|
git svn rebase &&
|
||||||
test -f "$unhandled".gz &&
|
test_path_is_file "$unhandled".gz &&
|
||||||
test -f "$unhandled" &&
|
test_path_is_file "$unhandled" &&
|
||||||
for i in a b c "weird file name" gz "! !"
|
for i in a b c "weird file name" gz "! !"
|
||||||
do
|
do
|
||||||
if ! test -d "$i"
|
test_path_is_dir "$i" || exit 1
|
||||||
then
|
|
||||||
echo >&2 "$i does not exist" &&
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue