[PATCH v2 8/8] t4012: Use test_must_fail instead of if-else
- From
Alexander Strasser <eclipse7@gmx.net>
- Date
- Jul 16, 2012, 20:47 UTC
- Message-ID
- <629b1abf980cd9aac28ae8c55dd52a9124c15b55.1342468069.git.eclipse7@gmx.net>
- In-Reply-To
- <cover.1342468069.git.eclipse7@gmx.net>
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> --- t/t4012-diff-binary.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 077870e..ec4deea 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -66,13 +66,7 @@ test_expect_success 'apply --numstat understands diff --binary format' ' test_expect_success 'apply detecting corrupt patch correctly' ' git diff >output && sed -e "s/-CIT/xCIT/" <output >broken && - if git apply --stat --summary broken 2>detected - then - echo unhappy - should have detected an error - (exit 1) - else - echo happy - fi && + test_must_fail git apply --stat --summary broken 2>detected && detected=`cat detected` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && 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' ' git diff --binary | sed -e "s/-CIT/xCIT/" >broken && - if git apply --stat --summary broken 2>detected - then - echo unhappy - should have detected an error - (exit 1) - else - echo happy - fi && + test_must_fail git apply --stat --summary broken 2>detected && detected=`cat detected` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`sed -ne "${detected}p" broken` &&
-- 1.7.10.2.552.gaa3bb87