Re: [PATCH 2/2] Don't rely on strerror text when testing rmdir failure

From: Charles Bailey <cbailey32@bloomberg.net>
Date: Mar 29, 2014, 15:58 UTC
Message-ID: <20140329155817.GA23238@hashpling.org>
In-Reply-To: <5336EB5C.6040103@web.de>

On Sat, Mar 29, 2014 at 04:48:44PM +0100, Jens Lehmann wrote:

Show 15 quoted lines

> Am 29.03.2014 16:39, schrieb Charles Bailey:
> > diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
> > index 3d30581..23eed17 100755
> > --- a/t/t3600-rm.sh
> > +++ b/t/t3600-rm.sh
> > @@ -709,10 +709,9 @@ test_expect_success 'checking out a commit after submodule removal needs manual
> >  	git commit -m "submodule removal" submod &&
> >  	git checkout HEAD^ &&
> >  	git submodule update &&
> > -	git checkout -q HEAD^ 2>actual &&
> > +	git checkout -q HEAD^ 2>/dev/null &&
> 
> Isn't this unrelated to the strerror issue you are fixing here?
> Why not just drop the redirection completely? But maybe I'm just
> being to pedantic here ;-)

Well, it's a write to 'actual' and the next thing that tests the contents of 'actual' is the thing that I'm fixing so it's almost related. (See context kept below.)

I changed the redirection here while investigating the bug. The redirected output was being overwritten immediately and this was a more explicit way to write "I don't care about whatever goes to stderr from this command" which confused me less that merely overwriting the file on the next line, but perhaps simply not redirecting is better. I really didn't give it much thought.

Show 5 quoted lines

> 
> >  	git checkout -q master 2>actual &&
> > -	echo "warning: unable to rmdir submod: Directory not empty" >expected &&
> > -	test_i18ncmp expected actual &&
> > +	test_i18ngrep "^warning: unable to rmdir submod:" actual &&

Charles.