From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jeff King <peff@peff.net>, Luke Diamand <luke@diamand.org>,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH 05/11] tests: use 'test_atexit' to stop httpd
Date: Thu, 14 Mar 2019 12:28:35 +0900 [thread overview]
Message-ID: <xmqqd0mub0d8.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190313122419.2210-6-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Wed, 13 Mar 2019 13:24:13 +0100")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> t/lib-git-svn.sh | 5 -----
> t/lib-httpd.sh | 6 +-----
> t/t0410-partial-clone.sh | 2 --
> t/t5500-fetch-pack.sh | 3 ---
> t/t5510-fetch.sh | 2 --
> t/t5537-fetch-shallow.sh | 2 --
> t/t5539-fetch-http-shallow.sh | 1 -
> t/t5540-http-push-webdav.sh | 2 --
> t/t5541-http-push-smart.sh | 1 -
> t/t5542-push-http-shallow.sh | 1 -
> t/t5545-push-options.sh | 2 --
> t/t5550-http-fetch-dumb.sh | 1 -
> t/t5551-http-fetch-smart.sh | 1 -
> t/t5561-http-backend.sh | 1 -
> t/t5581-http-curl-verbose.sh | 2 --
> t/t5601-clone.sh | 2 --
> t/t5616-partial-clone.sh | 2 --
> t/t5700-protocol-v1.sh | 2 --
> t/t5702-protocol-v2.sh | 2 --
> t/t5703-upload-pack-ref-in-want.sh | 2 --
> t/t5812-proto-disable-http.sh | 1 -
> t/t9115-git-svn-dcommit-funky-renames.sh | 2 --
> t/t9118-git-svn-funky-branch-names.sh | 2 --
> t/t9120-git-svn-clone-with-percent-escapes.sh | 2 --
> t/t9142-git-svn-shallow-clone.sh | 2 --
I see most of these changes are removal of stop_httpd because it is
done as part of start_httpd() to arrange it to be called at exit.
But ...
> @@ -176,7 +175,7 @@ prepare_httpd() {
> start_httpd() {
> prepare_httpd >&3 2>&4
>
> - trap 'code=$?; stop_httpd; (exit $code); die' EXIT
> + test_atexit stop_httpd
>
> "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
> -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
> @@ -184,15 +183,12 @@ start_httpd() {
> >&3 2>&4
> if test $? -ne 0
> then
> - trap 'die' EXIT
> cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
> test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
> fi
> }
>
> stop_httpd() {
> - trap 'die' EXIT
> -
> "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
> -f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
> }
... I see we lost many "trap 'die' EXIT" in the orignal. Is that
something we want to lose as part of this commit? It does not make
sense, at least to me, to add a "test_atexit die" and I am mostly
wondering what these traps were trying to do in the original.
next prev parent reply other threads:[~2019-03-14 3:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 12:24 [PATCH 00/11] tests: introduce 'test_atexit' SZEDER Gábor
2019-03-13 12:24 ` [PATCH 01/11] test-lib: fix interrupt handling with 'dash' and '--verbose-log -x' SZEDER Gábor
2019-03-14 2:18 ` Junio C Hamano
2019-03-14 14:50 ` SZEDER Gábor
2019-03-13 12:24 ` [PATCH 02/11] t/lib-git-daemon: make sure to kill the 'git-daemon' process SZEDER Gábor
2019-03-14 2:35 ` Junio C Hamano
2019-03-13 12:24 ` [PATCH 03/11] test-lib: introduce 'test_atexit' SZEDER Gábor
2019-03-14 3:21 ` Junio C Hamano
2019-03-14 17:40 ` SZEDER Gábor
2019-03-18 1:50 ` Junio C Hamano
2019-03-13 12:24 ` [PATCH 04/11] git-daemon: use 'test_atexit` to stop 'git-daemon' SZEDER Gábor
2019-03-13 12:24 ` [PATCH 05/11] tests: use 'test_atexit' to stop httpd SZEDER Gábor
2019-03-14 3:28 ` Junio C Hamano [this message]
2019-03-14 4:34 ` Junio C Hamano
2019-03-14 15:19 ` SZEDER Gábor
2019-03-13 12:24 ` [PATCH 06/11] t0301-credential-cache: use 'test_atexit' to stop the credentials helper SZEDER Gábor
2019-03-13 12:24 ` [PATCH 07/11] git p4 test: use 'test_atexit' to kill p4d and the watchdog process SZEDER Gábor
2019-03-13 12:24 ` [PATCH 08/11] git p4 test: clean up the p4d cleanup functions SZEDER Gábor
2019-03-13 12:24 ` [PATCH 09/11] git p4 test: simplify timeout handling SZEDER Gábor
2019-03-13 12:24 ` [PATCH 10/11] git p4 test: disable '-x' tracing in the p4d watchdog loop SZEDER Gábor
2019-03-13 12:24 ` [PATCH 11/11] t9811-git-p4-label-import: fix pipeline negation 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
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=xmqqd0mub0d8.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
--cc=peff@peff.net \
--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).