kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t4117: use modern test_* helpers 

We can use test_must_fail and test_path_* to avoid some
hand-rolled if statements. This makes the code shorter, and
makes it more obvious when we are breaking the &&-chain.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-03-20 06:13:18 -04:00 committed by Junio C Hamano
parent 2f69de5b4b
commit e7d053ddb9
1 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
t/t4117-apply-reject.sh
View File

@ -56,23 +56,13 @@ test_expect_success 'apply --reject is incompatible with --3way' '

test_expect_success 'apply without --reject should fail' '

if git apply patch.1
then
echo "Eh? Why?"
exit 1
fi

test_must_fail git apply patch.1 &&
test_cmp file1 saved.file1
'

test_expect_success 'apply without --reject should fail' '

if git apply --verbose patch.1
then
echo "Eh? Why?"
exit 1
fi

test_must_fail git apply --verbose patch.1 &&
test_cmp file1 saved.file1
'

@ -81,21 +71,11 @@ test_expect_success 'apply with --reject should fail but update the file' '
cat saved.file1 >file1 &&
rm -f file1.rej file2.rej &&

if git apply --reject patch.1
then
echo "succeeds with --reject?"
exit 1
fi

test_must_fail git apply --reject patch.1 &&
test_cmp file1 expected &&

cat file1.rej &&

if test -f file2.rej
then
echo "file2 should not have been touched"
exit 1
fi
test_path_is_missing file2.rej
'

test_expect_success 'apply with --reject should fail but update the file' '
@ -103,25 +83,12 @@ test_expect_success 'apply with --reject should fail but update the file' '
cat saved.file1 >file1 &&
rm -f file1.rej file2.rej file2 &&

if git apply --reject patch.2 >rejects
then
echo "succeeds with --reject?"
exit 1
fi

test -f file1 && {
echo "file1 still exists?"
exit 1
}
test_must_fail git apply --reject patch.2 >rejects &&
test_path_is_missing file1 &&
test_cmp file2 expected &&

cat file2.rej &&

if test -f file1.rej
then
echo "file2 should not have been touched"
exit 1
fi
test_path_is_missing file1.rej

'

@ -130,25 +97,12 @@ test_expect_success 'the same test with --verbose' '
cat saved.file1 >file1 &&
rm -f file1.rej file2.rej file2 &&

if git apply --reject --verbose patch.2 >rejects
then
echo "succeeds with --reject?"
exit 1
fi

test -f file1 && {
echo "file1 still exists?"
exit 1
}
test_must_fail git apply --reject --verbose patch.2 >rejects &&
test_path_is_missing file1 &&
test_cmp file2 expected &&

cat file2.rej &&

if test -f file1.rej
then
echo "file2 should not have been touched"
exit 1
fi
test_path_is_missing file1.rej

'