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

Re: [PATCH 4/8] t5550: remove use of `test_might_fail grep`

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 25, 2020, 06:35 UTC
Message-ID
<xmqqr1xhx7p6.fsf@gitster.c.googlers.com>
In-Reply-To
<68c911e29b509d75e390aba573921d6ac385fcaf.1585115341.git.liu.denton@gmail.com>
Denton Liu <liu.denton@gmail.com> writes:
Show 19 quoted lines
> The test_must_fail() family of functions (including test_might_fail())
> should only be used on git commands. Rewrite the use of
> test_might_fail() with grep to remove this improper usage.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
>  t/t5550-http-fetch-dumb.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
> index b811d89cfd..a06294ad8f 100755
> --- a/t/t5550-http-fetch-dumb.sh
> +++ b/t/t5550-http-fetch-dumb.sh
> @@ -248,7 +248,7 @@ test_expect_success 'fetch can handle previously-fetched .idx files' '
>  '
>  
>  test_expect_success 'did not use upload-pack service' '
> -	test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act &&
> +	{ grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act || :; } &&
We can use
	sed -n -e "/\/git-upload-pack/p" "$HTTPD_ROOT_PATH/access.log" >actual

instead, but "grep for the pattern but don't worry if we found no match" is also OK.

>  	: >exp &&
>  	test_cmp exp act

Having said that, if the expectation is not to find any match, shouldn't the whole test be just

	! grep "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log"
a single liner?  In any case, the use of sq in the original is broken.
>  '
Previous: Denton LiuNext: Denton Liu
Message 9 of 30 in “t: replace incorrect test_must_fail usage (part 3)”
  1. 0/8 t: replace incorrect test_must_fail usage (part 3)Denton Liu, Mar 25, 2020
  2. 1/8 t5512: don't use `test_must_fail test_cmp`Denton Liu, Mar 25, 2020
  3. 3/8 t5512: stop losing return codes of git commandsDenton Liu, Mar 25, 2020
  4. 2/8 t5512: generate references with generate_references()Denton Liu, Mar 25, 2020
  5. Eric SunshineMar 25, 2020
  6. Junio C HamanoMar 25, 2020
  7. 5/8 t5607: reorder `nongit test_must_fail`Denton Liu, Mar 25, 2020
  8. 4/8 t5550: remove use of `test_might_fail grep`Denton Liu, Mar 25, 2020
  9. Junio C HamanoMar 25, 2020
  10. 8/8 t5801: teach compare_refs() to accept !Denton Liu, Mar 25, 2020
  11. Junio C HamanoMar 25, 2020
  12. Eric SunshineMar 25, 2020
  13. 7/8 t5612: stop losing return codes of git commandsDenton Liu, Mar 25, 2020
  14. 6/8 t5612: don't use `test_must_fail test_cmp`Denton Liu, Mar 25, 2020
  15. Junio C HamanoMar 25, 2020
  16. 0/8 t: replace incorrect test_must_fail usage (part 3)Denton Liu, Mar 26, 2020
  17. 1/8 t5512: don't use `test_must_fail test_cmp`Denton Liu, Mar 26, 2020
  18. 2/8 t5512: stop losing git exit code in here-docsDenton Liu, Mar 26, 2020
  19. Eric SunshineMar 26, 2020
  20. 3/8 t5512: stop losing return codes of git commandsDenton Liu, Mar 26, 2020
  21. 4/8 t5550: simplify no matching line checkDenton Liu, Mar 26, 2020
  22. Eric SunshineMar 26, 2020
  23. 5/8 t5607: reorder `nongit test_must_fail`Denton Liu, Mar 26, 2020
  24. 6/8 t5612: don't use `test_must_fail test_cmp`Denton Liu, Mar 26, 2020
  25. 7/8 t5612: stop losing return codes of git commandsDenton Liu, Mar 26, 2020
  26. 8/8 t5801: teach compare_refs() to accept !Denton Liu, Mar 26, 2020
  27. 9/9 fixup! t5512: stop losing git exit code in here-docsDenton Liu, Mar 27, 2020
  28. Junio C HamanoMar 27, 2020
  29. Eric SunshineMar 27, 2020
  30. Junio C HamanoMar 27, 2020

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.