development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

t3030 (merge-recursive): use test_expect_code

Browse source 
Use test_expect_code in preference to repeatedly checking exit codes
by hand.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramkumar Ramachandra 2011-12-08 18:40:13 +05:30 committed by Junio C Hamano
parent 02380389c6
commit 67b6afe1ed
1 changed files with 6 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
t/t3030-merge-recursive.sh
View file

@ -285,17 +285,7 @@ test_expect_success 'merge-recursive simple' '
rm -fr [abcd] &&
git checkout -f "$c2" &&
git merge-recursive "$c0" -- "$c2" "$c1"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
'
test_expect_success 'merge-recursive result' '
@ -334,17 +324,7 @@ test_expect_success 'merge-recursive remove conflict' '
rm -fr [abcd] &&
git checkout -f "$c1" &&
git merge-recursive "$c0" -- "$c1" "$c5"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
'
test_expect_success 'merge-recursive remove conflict' '
@ -388,17 +368,7 @@ test_expect_success 'merge-recursive d/f conflict' '
git reset --hard &&
git checkout -f "$c1" &&
git merge-recursive "$c0" -- "$c1" "$c4"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
'
test_expect_success 'merge-recursive d/f conflict result' '
@ -422,17 +392,7 @@ test_expect_success 'merge-recursive d/f conflict the other way' '
git reset --hard &&
git checkout -f "$c4" &&
git merge-recursive "$c0" -- "$c4" "$c1"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
'
test_expect_success 'merge-recursive d/f conflict result the other way' '
@ -456,17 +416,7 @@ test_expect_success 'merge-recursive d/f conflict' '
git reset --hard &&
git checkout -f "$c1" &&
git merge-recursive "$c0" -- "$c1" "$c6"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
'
test_expect_success 'merge-recursive d/f conflict result' '
@ -490,17 +440,7 @@ test_expect_success 'merge-recursive d/f conflict' '
git reset --hard &&
git checkout -f "$c6" &&
git merge-recursive "$c0" -- "$c6" "$c1"
status=$?
case "$status" in
1)
: happy
;;
*)
echo >&2 "why status $status!!!"
false
;;
esac
test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
'
test_expect_success 'merge-recursive d/f conflict result' '