From: Junio C Hamano <gitster@pobox•com>
To: "SZEDER Gábor" <szeder.dev@gmail•com>
Cc: Jeff King <peff@peff•net>, 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: Thu, 20 Apr 2017 17:48:55 -0700 [thread overview]
Message-ID: <xmqq7f2e8u14.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170420165230.5951-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Thu, 20 Apr 2017 18:52:30 +0200")
SZEDER Gábor <szeder.dev@gmail•com> writes:
> We had two similar bugs in the tests sporadically triggering error
> messages during the removal of the trash directory, see commits
> bb05510e5 (t5510: run auto-gc in the foreground, 2016-05-01) and
> ef09036cf (t6500: wait for detached auto gc at the end of the test
> script, 2017-04-13). The test script succeeded nonetheless, because
> these errors are ignored during housekeeping in 'test_done'.
>
> However, such an error is a sign that something is fishy in the test
> script. Print an error message and abort the test script when the
> trash directory can't be removed successfully or is already removed,
> because that's unexpected and we woud prefer somebody notice and
> figure out why.
Makes sense to me, too.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail•com>
> ---
>
> Note, that the commit message references ef09036cf (t6500: wait for
> detached auto gc at the end of the test script, 2017-04-13), which
> is still only in 'pu'.
I think that one is already part of 2.13-rc0 ;-)
> t/test-lib.sh | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> 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"
> +
> cd "$(dirname "$remove_trash")" &&
> - rm -rf "$(basename "$remove_trash")"
> + rm -rf "$(basename "$remove_trash")" ||
> + error "Tests passed but test cleanup failed; aborting"
>
> test_at_end_hook_
next prev parent reply other threads:[~2017-04-21 0:49 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 [this message]
2017-04-21 20:06 ` SZEDER Gábor
2017-04-21 20:15 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7f2e8u14.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twosigma$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
--cc=szeder.dev@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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