From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Stefan Beller <sbeller@google.com>, Johannes Sixt <j6t@kdbg.org>,
David Turner <dturner@twosigma.com>,
git@vger.kernel.org
Subject: Re: [PATCH] test-lib: abort when can't remove trash directory
Date: Fri, 21 Apr 2017 16:15:28 -0400 [thread overview]
Message-ID: <20170421201527.wdtxhox3p4g35gex@sigill.intra.peff.net> (raw)
In-Reply-To: <20170420165230.5951-1-szeder.dev@gmail.com>
On Thu, Apr 20, 2017 at 06:52:30PM +0200, SZEDER Gábor wrote:
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 13b569682..e9e6f677d 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -761,9 +761,12 @@ test_done () {
> say "1..$test_count$skip_all"
> fi
>
> - test -d "$remove_trash" &&
> + test -d "$remove_trash" ||
> + error "Tests passed but trash directory already removed before test cleanup; aborting"
I think I found out why this "test -d" was here in the first place:
$ ./t0000-basic.sh --debug
[...]
# passed all 77 test(s)
1..77
error: Tests passed but trash directory already removed before test cleanup; aborting
When --debug is in use, we do not set $remove_trash. The original was
relying on 'test -d ""' to return false.
I think this whole removal block should probably be moved inside a
conditional like:
if test -n "$remove_trash"
then
...
fi
I also wonder if we should come up with a better name than
$remove_trash. A script which unknowingly overwrites that variable would
be disastrous.
Perhaps we should drop it entirely and just do:
if test -z "$debug"
then
test -d "$TRASH_DIRECTORY" ||
error "Tests passed but..."
[and so forth...]
fi
-Peff
next prev parent reply other threads:[~2017-04-21 20:15 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 12:59 [PATCH] t6500: don't run detached auto gc at the end of the test script SZEDER Gábor
2017-04-10 13:58 ` Jeff King
2017-04-10 16:31 ` SZEDER Gábor
2017-04-10 16:35 ` Jeff King
2017-04-10 16:56 ` SZEDER Gábor
2017-04-10 17:01 ` Jeff King
2017-04-11 21:32 ` Johannes Sixt
2017-04-12 0:27 ` SZEDER Gábor
2017-04-12 0:50 ` Jeff King
2017-04-12 22:03 ` SZEDER Gábor
2017-04-12 22:07 ` [PATCHv2] " SZEDER Gábor
2017-04-13 10:31 ` [PATCHv2.1] t6500: wait for " SZEDER Gábor
2017-04-13 16:06 ` David Turner
2017-04-13 16:44 ` Jeff King
2017-04-13 18:08 ` SZEDER Gábor
2017-04-13 18:12 ` Jeff King
2017-04-13 16:37 ` [PATCH] t6500: don't run " Jeff King
2017-04-13 17:55 ` Stefan Beller
2017-04-13 17:57 ` Jeff King
2017-04-13 19:03 ` SZEDER Gábor
2017-04-13 19:12 ` Jeff King
2017-04-13 19:35 ` SZEDER Gábor
2017-04-14 20:08 ` Jeff King
2017-04-20 16:42 ` SZEDER Gábor
2017-04-20 16:45 ` Jeff King
2017-04-20 16:52 ` [PATCH] test-lib: abort when can't remove trash directory SZEDER Gábor
2017-04-20 19:06 ` Jeff King
2017-04-21 0:48 ` Junio C Hamano
2017-04-21 20:06 ` SZEDER Gábor
2017-04-21 20:15 ` Jeff King [this message]
2017-04-24 0:14 ` Junio C Hamano
2017-04-24 1:43 ` Jeff King
2017-04-24 2:58 ` Junio C Hamano
2017-04-24 4:02 ` Junio C Hamano
2017-04-24 7:52 ` Jeff King
2017-04-24 9:39 ` Torsten Bögershausen
2017-04-24 9:46 ` Jeff King
2017-04-25 2:31 ` Junio C Hamano
2017-04-25 6:05 ` Junio C Hamano
2017-04-25 6:07 ` Jeff King
2017-04-25 6:31 ` 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=20170421201527.wdtxhox3p4g35gex@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sbeller@google.com \
--cc=szeder.dev@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).