Re: [PATCH 05/11] tests: use 'test_atexit' to stop httpd
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 14, 2019, 03:28 UTC
- Message-ID
- <xmqqd0mub0d8.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20190313122419.2210-6-szeder.dev@gmail.com>
SZEDER Gábor <szeder.dev@gmail.com> writes:
Show 25 quoted lines
> 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 ...
Show 25 quoted lines
> @@ -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.