git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
	Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
	Git List <git@vger.kernel.org>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Ramkumar
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH v2 02/20] t5800: factor out some ref tests
Date: Sun, 19 Jun 2011 17:18:27 +0200	[thread overview]
Message-ID: <1308496725-22329-3-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1308496725-22329-1-git-send-email-srabbelier@gmail.com>

From: Jeff King <peff@peff.net>

These are a little hard to read, and I'm about to add more
just like them. Plus the failure output is nicer if we use
test_cmp than a comparison with "test".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---

  Unchanged.

 t/t5800-remote-helpers.sh |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 1fb6380..3a37ad0 100755
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -17,6 +17,12 @@ then
 	test_set_prereq PYTHON_24
 fi
 
+compare_refs() {
+	git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
+	git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
+	test_cmp expect actual
+}
+
 test_expect_success PYTHON_24 'setup repository' '
 	git init --bare server/.git &&
 	git clone server public &&
@@ -59,8 +65,7 @@ test_expect_success PYTHON_24 'pushing to local repo' '
 	echo content >>file &&
 	git commit -a -m three &&
 	git push) &&
-	HEAD=$(git --git-dir=localclone/.git rev-parse --verify HEAD) &&
-	test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+	compare_refs localclone HEAD server HEAD
 '
 
 test_expect_success PYTHON_24 'synch with changes from localclone' '
@@ -73,8 +78,7 @@ test_expect_success PYTHON_24 'pushing remote local repo' '
 	echo content >>file &&
 	git commit -a -m four &&
 	git push) &&
-	HEAD=$(git --git-dir=clone/.git rev-parse --verify HEAD) &&
-	test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+	compare_refs clone HEAD server HEAD
 '
 
 test_done
-- 
1.7.5.1.292.g728120

  parent reply	other threads:[~2011-06-19 15:19 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-19 15:18 [PATCH v2 v2 00/20] remote-helper improvements Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 01/20] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-06-19 15:18 ` Sverre Rabbelier [this message]
2011-06-19 15:18 ` [PATCH v2 03/20] t5800: use skip_all instead of prereq Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 04/20] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-06-19 22:02   ` Jonathan Nieder
2011-07-04 11:19     ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 05/20] teach remote-testgit to import non-HEAD refs Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 06/20] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 07/20] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 08/20] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-06-19 22:42   ` Jonathan Nieder
2011-07-04 14:11     ` Sverre Rabbelier
2011-06-20  2:35   ` Dmitry Ivankov
2011-06-20  7:55     ` Jonathan Nieder
2011-06-20 19:41       ` Junio C Hamano
2011-06-19 15:18 ` [PATCH v2 09/20] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 10/20] git-remote-testgit: fix error handling Sverre Rabbelier
2011-06-19 22:58   ` Jonathan Nieder
2011-06-20 17:50     ` Brandon Casey
2011-06-20 18:02       ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 11/20] fast-import: introduce 'done' command Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 12/20] fast-export: support done feature Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 13/20] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 14/20] transport-helper: check status code of finish_command Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 15/20] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-06-20 11:45   ` Jonathan Nieder
2011-06-20 19:51     ` Junio C Hamano
2011-07-04 13:37     ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 16/20] transport-helper: update ref status after push with export Sverre Rabbelier
2011-06-19 23:25   ` Jonathan Nieder
2011-06-21 20:05   ` Junio C Hamano
2011-06-21 20:11     ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 17/20] transport-helper: change import semantics Sverre Rabbelier
2011-06-19 23:38   ` Jonathan Nieder
2011-07-04 11:20     ` Sverre Rabbelier
2011-07-04 21:58       ` Jonathan Nieder
2011-07-04 22:23         ` Sverre Rabbelier
2011-07-04 22:37           ` Jonathan Nieder
2011-06-19 15:18 ` [PATCH v2 18/20] transport-helper: export is no longer always the last command Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 19/20] transport-helper: Use capname for gitdir capability too Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 20/20] transport-helper: implement marks location as capability Sverre Rabbelier
2011-06-20  1:29   ` Jonathan Nieder
2011-07-04 13:43     ` Sverre Rabbelier

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=1308496725-22329-3-git-send-email-srabbelier@gmail.com \
    --to=srabbelier@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    /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).