From: Junio C Hamano <gitster@pobox.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH] Improved and extended t5404
Date: Wed, 14 Nov 2007 13:52:19 -0800 [thread overview]
Message-ID: <7vbq9wfqb0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071113230234.GI3268@steel.home> (Alex Riesen's message of "Wed, 14 Nov 2007 00:02:34 +0100")
Alex Riesen <raa.lkml@gmail.com> writes:
> Ignore exit code of git push in t5404, as it is not relevant for the
> test: it already checks whether the references updated correctly.
I think the Subject: goes a lot better with a description like this:
Add test that checks the case where X does Y and make
sure Z happens.
Because we haven't settled on what the exit status from
"git push" command itself should be in such a partial
failure case, do not check the exit status from it for
now.
> diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
> index 20718d4..a51bbdc 100755
> --- a/t/t5404-tracking-branches.sh
> +++ b/t/t5404-tracking-branches.sh
> @@ -10,6 +10,7 @@ test_expect_success 'setup' '
> git commit -m 1 &&
> git branch b1 &&
> git branch b2 &&
> + git branch b3 &&
> git clone . aa &&
> git checkout b1 &&
> ...
So it makes another ref "b3" point at the initial commit,...
> ...
> test_expect_success 'check tracking branches updated correctly after push' '
> cd aa &&
> b1=$(git rev-parse origin/b1) &&
> b2=$(git rev-parse origin/b2) &&
> + b3=$(git rev-parse origin/b3) &&
> git checkout -b b1 origin/b1 &&
> echo aa-b1 >>file &&
> git commit -a -m aa-b1 &&
... then records what was cloned,...
> @@ -32,9 +36,28 @@ test_expect_success 'check tracking branches updated correctly after push' '
> git checkout master &&
> echo aa-master >>file &&
> git commit -a -m aa-master &&
> + {
> + git push
> + test "$(git rev-parse origin/b1)" = "$b1" &&
> + test "$(git rev-parse origin/b2)" = "$b2" &&
> + test "$(git rev-parse origin/b3)" = "$b3" &&
> + test "$(git rev-parse origin/master)" = \
> + "$(git rev-parse master)"
> + }
> +'
... and checks that untouched "b3" stays the same (iow, tests
up-to-date case).
> +
> +test_expect_success 'delete remote branch' '
> + git push origin :refs/heads/b3
> + {
> + git rev-parse origin/b3
> + test $? != 0 || \
> + say "Hmm... Maybe tracking ref should be deleted?"
> + } &&
Ah, you meant that tracking should be deleted so this should be
fixed in the code but the test is disabled for now. Let's be a
bit more explicit about such a temporary disabled test, like
this:
git push origin :refs/heads/b3
# The remote-tracking branch origin/b3 should be deleted;
# we need to update the code and enable this test.
: git rev-parse --verify origin/b3 &&
> + cd "$start_dir" &&
> + {
> + git rev-parse refs/heads/b3
> + test $? != 0
> + }
> '
next prev parent reply other threads:[~2007-11-14 21:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-12 21:38 [PATCH] Add a test checking if send-pack updated local tracking branches correctly Alex Riesen
2007-11-12 21:39 ` [PATCH] Update the tracking references only if they were succesfully updated on remote Alex Riesen
2007-11-13 7:52 ` Jeff King
2007-11-13 19:47 ` Alex Riesen
2007-11-13 19:49 ` [PATCH] Add a test for deleting remote branches Alex Riesen
2007-11-13 23:02 ` [PATCH] Improved and extended t5404 Alex Riesen
2007-11-13 23:10 ` Jeff King
2007-11-15 4:26 ` Jeff King
2007-11-15 20:46 ` [PATCH] Add test that checks diverse aspects of updating remote and tracking branches Alex Riesen
2007-11-14 0:02 ` [PATCH] Improved and extended t5404 Junio C Hamano
2007-11-14 7:19 ` Alex Riesen
2007-11-14 8:47 ` Junio C Hamano
2007-11-14 17:10 ` Johannes Schindelin
2007-11-14 19:45 ` Alex Riesen
2007-11-14 20:34 ` Alex Riesen
2007-11-14 22:01 ` Johannes Schindelin
2007-11-15 4:18 ` Jeff King
2007-11-15 4:35 ` Jeff King
2007-11-15 5:55 ` Junio C Hamano
2007-11-14 21:52 ` Junio C Hamano [this message]
2007-11-14 22:49 ` [PATCH] Add test that checks diverse aspects of updating remote and tracking branches Alex Riesen
2007-11-14 21:52 ` [PATCH] Improved and extended t5404 Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbq9wfqb0.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=raa.lkml@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).