git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 10/11] t5570: make test "set -e" clean

From
Patrick Steinhardt <ps@pks.im>
Date
Mar 25, 2026, 07:16 UTC
Message-ID
<acOLt7GuLTpg_QYM@pks.im>
In-Reply-To
<20260325062114.2067946-11-gitster@pobox.com>
On Tue, Mar 24, 2026 at 11:21:13PM -0700, Junio C Hamano wrote:
Show 21 quoted lines
> diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
> index e62569222b..6850f08c1d 100644
> --- a/t/lib-git-daemon.sh
> +++ b/t/lib-git-daemon.sh
> @@ -86,13 +86,13 @@ stop_git_daemon() {
>  	# kill git-daemon child of git
>  	say >&3 "Stopping git daemon ..."
>  	kill "$GIT_DAEMON_PID"
> -	wait "$GIT_DAEMON_PID" >&3 2>&4
> -	ret=$?
> +	ret=0
> +	wait "$GIT_DAEMON_PID" >&3 2>&4 || ret=$?
>  	if ! test_match_signal 15 $ret
>  	then
>  		error "git daemon exited with status: $ret"
>  	fi
> -	kill "$(cat "$GIT_DAEMON_PIDFILE")" 2>/dev/null
> +	kill "$(cat "$GIT_DAEMON_PIDFILE")" 2>/dev/null || :
>  	GIT_DAEMON_PID=
>  	rm -f git_daemon_output "$GIT_DAEMON_PIDFILE"
>  }

This test actually made me pause a bit. In theory, you can use the function to verify that git-daemon(1) exits successfully because we do bubble up its exit code. So instead of silencing the error code, I simply added `|| :` to all callsites that don't care about it at all.

But in practice, that turned out to be every callsite, so that exercise may not be worth it.

Patrick
Previous: Junio C HamanoNext: Junio C Hamano
Message 24 of 28 in “detect misspelt test_expect_success and friends”
  1. 00/11 detect misspelt test_expect_success and friendsJunio C Hamano, Mar 25, 2026
  2. 01/11 test-lib: catch misspelt 'test_expect_successo'Junio C Hamano, Mar 25, 2026
  3. Jeff KingMar 26, 2026
  4. Junio C HamanoMar 26, 2026
  5. Jeff KingMar 26, 2026
  6. Patrick SteinhardtMar 27, 2026
  7. Junio C HamanoMar 27, 2026
  8. Patrick SteinhardtMar 31, 2026
  9. 02/11 t0008: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  10. 03/11 t6002: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  11. Patrick SteinhardtMar 25, 2026
  12. Junio C HamanoMar 25, 2026
  13. 04/11 t4032: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  14. Patrick SteinhardtMar 25, 2026
  15. 05/11 t7450: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  16. Patrick SteinhardtMar 25, 2026
  17. 06/11 tests: make svn test "set -e" cleanJunio C Hamano, Mar 25, 2026
  18. Patrick SteinhardtMar 25, 2026
  19. 07/11 t7508: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  20. 08/11 t9200: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  21. Patrick SteinhardtMar 25, 2026
  22. 09/11 t940?: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  23. 10/11 t5570: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  24. Patrick SteinhardtMar 25, 2026
  25. Junio C HamanoMar 25, 2026
  26. 11/11 t9902: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  27. Patrick SteinhardtMar 25, 2026
  28. Junio C HamanoMar 25, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.