[PATCH 13/15] t3030 (merge-recursive): use test_expect_code

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: [PATCH 13/15] t3030 (merge-recursive): use test_expect_code
Date: Thu,  8 Dec 2011 01:06:49 +0530	[thread overview]
Message-ID: <1323286611-4806-14-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1323286611-4806-1-git-send-email-artagnon@gmail.com>

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

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t3030-merge-recursive.sh |   72 ++++----------------------------------------
 1 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 55ef189..a5e3da7 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -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' '
-- 
1.7.7.3

next prev parent reply	other threads:[~2011-12-07 19:38 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-06  5:01 What's cooking in git.git (Dec 2011, #02; Mon, 5) Junio C Hamano
2011-12-06  5:35 ` Ramkumar Ramachandra
2011-12-06 18:20   ` Junio C Hamano
2011-12-06 20:30     ` Ramkumar Ramachandra
2011-12-07 10:08       ` &&-chaining tester Jonathan Nieder
2011-12-07 19:36         ` Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 01/15] t1013 (loose-object-format): fix && chaining Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 02/15] t1300 (repo-config): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 03/15] t1412 (reflog-loop): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 04/15] t1007 (hash-object): " Ramkumar Ramachandra
2011-12-07 21:47             ` Jonathan Nieder
2011-12-08  4:42               ` Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 05/15] t1510 (repo-setup): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 06/15] t1511 (rev-parse-caret): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 07/15] t1510 (worktree): " Ramkumar Ramachandra
2011-12-07 21:51             ` Jonathan Nieder
2011-12-08  4:39               ` Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 08/15] t3200 (branch): " Ramkumar Ramachandra
2011-12-07 21:55             ` Jonathan Nieder
2011-12-08  4:47               ` Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 09/15] t3418 (rebase-continue): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 10/15] t3400 (rebase): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 11/15] t3310 (notes-merge-manual-resolve): " Ramkumar Ramachandra
2011-12-07 19:36           ` [PATCH 12/15] t3419 (rebase-patch-id): " Ramkumar Ramachandra
2011-12-07 19:36           ` Ramkumar Ramachandra [this message]
2011-12-07 21:57             ` [PATCH 13/15] t3030 (merge-recursive): use test_expect_code Jonathan Nieder
2011-12-07 19:36           ` [PATCH 14/15] t1006 (cat-file): use test_cmp Ramkumar Ramachandra
2011-12-07 22:01             ` Jonathan Nieder
2011-12-07 19:36           ` [PATCH 15/15] t3040 (subprojects-basic): modernize style Ramkumar Ramachandra
2011-12-07 22:21             ` Jonathan Nieder
2011-12-08 13:04               ` Ramkumar Ramachandra
2011-12-08  8:06           ` &&-chaining tester Matthieu Moy
2011-12-08 18:19       ` What's cooking in git.git (Dec 2011, #02; Mon, 5) Junio C Hamano
2011-12-06  5:52 ` Jeff King
2011-12-06 11:22   ` Erik Faye-Lund
2011-12-06 18:52     ` Jeff King
2011-12-08 19:44       ` Erik Faye-Lund
2011-12-08 21:25         ` Junio C Hamano
2011-12-06 18:35   ` Junio C Hamano
2011-12-06 18:47     ` Jeff King
2011-12-06 11:20 ` Nguyen Thai Ngoc Duy
2011-12-06 19:10   ` Junio C Hamano
2011-12-06 14:01 ` Nguyen Thai Ngoc Duy
2011-12-06 19:12   ` Junio C Hamano
2011-12-06 21:12 ` Luke Diamand

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:55ef189 dfblob:a5e3da7 )
 OR (
bs:"[PATCH 13/15] t3030 (merge-recursive): use test_expect_code" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323286611-4806-14-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).