mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4012: Use test_must_fail instead of if-else

Browse Source 
Make the code less bulky and easier to read. Also do not overlook
failures like e.g. git failing because of unexpected signals.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexander Strasser
2012-07-16 22:47:22 +02:00
committed by Junio C Hamano
parent 66fd93ee06
commit c7c0a2503f
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t4012-diff-binary.sh
View File

@ -66,13 +66,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '
test_expect_success 'apply detecting corrupt patch correctly' ' test_expect_success 'apply detecting corrupt patch correctly' '
git diff >output && git diff >output &&
sed -e "s/-CIT/xCIT/" <output >broken && sed -e "s/-CIT/xCIT/" <output >broken &&
if git apply --stat --summary broken 2>detected test_must_fail git apply --stat --summary broken 2>detected &&
then
echo unhappy - should have detected an error
(exit 1)
else
echo happy
fi &&
detected=`cat detected` && detected=`cat detected` &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
detected=`sed -ne "${detected}p" broken` && detected=`sed -ne "${detected}p" broken` &&
@ -81,13 +75,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
test_expect_success 'apply detecting corrupt patch correctly' ' test_expect_success 'apply detecting corrupt patch correctly' '
git diff --binary | sed -e "s/-CIT/xCIT/" >broken && git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
if git apply --stat --summary broken 2>detected test_must_fail git apply --stat --summary broken 2>detected &&
then
echo unhappy - should have detected an error
(exit 1)
else
echo happy
fi &&
detected=`cat detected` && detected=`cat detected` &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
detected=`sed -ne "${detected}p" broken` && detected=`sed -ne "${detected}p" broken` &&