From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t3600: fix broken "choking git rm" test
Date: Wed, 16 Oct 2013 02:38:46 +0200 [thread overview]
Message-ID: <20131016003846.GU19704@goldbirke> (raw)
In-Reply-To: <20131016001804.GJ9464@google.com>
On Tue, Oct 15, 2013 at 05:18:04PM -0700, Jonathan Nieder wrote:
> SZEDER Gábor wrote:
> > --- a/t/t3600-rm.sh
> > +++ b/t/t3600-rm.sh
> > @@ -240,18 +240,15 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
> >
> > test_expect_success 'choking "git rm" should not let it die with cruft' '
> > git reset -q --hard &&
> > + test_when_finished "rm -f .git/index.lock ; git reset -q --hard" &&
>
> I'd use "&&" here --- the test_cleanup checks the exit status from
> this scriptlet, so it's a good habit.
OK. My motivation for the ';' was that we should make sure that both
steps of the cleanup are executed. However, now thinking about it if
regular 'rm -f' can't remove the lock file then all bets are off
anyway.
> [...]
> > - test -f .git/index.lock
> > - status=$?
> > - rm -f .git/index.lock
> > - git reset -q --hard
> > - test "$status" != 0
> > + test ! -f .git/index.lock
>
> Gah. Thanks for cleaning it up.
>
> Maybe test_path_is_missing would make sense here? (It would notice a
> .git/index.lock directory, which is not very likely :), but more
> importantly, it says why it is failing the test when it fails.)
I was not aware of the test_path_is_missing helper. I don't think it
matters whether it's a file or a directory, because a stale
.git/index.lock directory would be just as bad.
next prev parent reply other threads:[~2013-10-16 0:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 0:01 [PATCH] t3600: fix broken "choking git rm" test SZEDER Gábor
2013-10-16 0:18 ` Jonathan Nieder
2013-10-16 0:38 ` SZEDER Gábor [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-16 0:48 SZEDER Gábor
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=20131016003846.GU19704@goldbirke \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--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).