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

[PATCH v2 1/5] test-lib-functions: introduce test_line_count_cmd

From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date
Jun 15, 2021, 17:20 UTC
Message-ID
<20210615172038.28917-2-congdanhqx@gmail.com>
In-Reply-To
<20210615172038.28917-1-congdanhqx@gmail.com>

In Git project, we have multiple occasions that requires checking number of lines of text in stdout and/or stderr of a command. One of such example is t6400, which checks number of files in various states.

Some of those commands are Git command, and we would like to check their exit status. In some of those checks, we pipe the stdout of those commands to "wc -l" to check for line count, thus loosing the exit status.

Introduce a helper function to check for number of lines in stdout and stderr from those commands.

This helper will create 2 temporary files in process, thus it may affect output of some checks.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 t/test-lib-functions.sh | 117 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index f0448daa74..b3281409de 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -845,6 +845,123 @@ test_line_count () {
 	fi
 }
 
+# test_line_count_cmd checks exit status, and the number of lines in
+# captured stdout and/or stderr of a command.
+#
+# Usage:
+#
+# test_line_count_cmd [--[out|err] <binop> <value>]... [--] [!] cmd [args...]
+#
+# Options:
+# --out <binop> <value>:
+# --err <binop> <value>:
+#	Run sh's "test <# of lines> <binop> <value>" on # of lines in stdout
+#	(for --out) or stderr (for --err)
+# !:
+#	Instead of expecting "cmd [args...]" succeed, expect its failure.
+#	Note, if command under testing is "git", test_must_fail should be used
+#	instead of "!".
+#
+# Example:
+#	test_line_count_cmd --out -ge 10 --err = 0 git tag --no-contains v1.0.0
+#	test_line_count_cmd --out -le 10 ! grep some-text a-file
+#	test_line_count_cmd --out = 0 test_must_fail git rev-parse --verify abcd1234
+#
+# NOTE:
+# * if "--out" is specified, a temporary file named test_line_count_cmd_.out
+#   will be created.
+# * if "--err" is specified, a temporary file named test_line_count_cmd_.err
+#   will be created.
+# Those temporary files will be created under $TRASH_DIRECTORY/.git/trash
+# if $TRASH_DIRECTORY/.git directory existed.
+# Otherwise, they will be created in $TRASH_DIRECTORY.
+# Those temporary files will be cleant by test_when_finished
+test_line_count_cmd () {
+	{
+		local outop outval outfile
+		local errop errval errfile
+		local expect_failure actual_failure
+		local trashdir="$TRASH_DIRECTORY"
+
+		if test -d "$TRASH_DIRECTORY/.git"
+		then
+			trashdir="$TRASH_DIRECTORY/.git/trash" &&
+			mkdir -p "$trashdir"
+		fi &&
+		while test $# != 0
+		do
+			case "$1" in
+			--out)
+				outop="$2" &&
+				outval="$3" &&
+				outfile="$trashdir/test_line_count_cmd_.out" &&
+				shift 3
+				;;
+			--err)
+				errop="$2" &&
+				errval="$3" &&
+				errfile="$trashdir/test_line_count_cmd_.err" &&
+				shift 3
+				;;
+			--)
+				shift &&
+				break
+				;;
+			-*)
+				BUG "test_line_count_cmd: unknown options: '$1'"
+				;;
+			*)
+				break
+				;;
+			esac
+		done &&
+		if test "x$1" = "x!"
+		then
+			shift &&
+			expect_failure=yes
+		fi &&
+		if test $# = 0
+		then
+			BUG "test_line_count_cmd: no command to be run"
+		elif test -z "$outop$errop"
+		then
+			BUG "test_line_count_cmd: check which stream?"
+		else
+			if test -n "$outfile"
+			then
+				test_when_finished "rm -f '$outfile'" &&
+				exec 8>"$outfile"
+			fi &&
+			if test -n "$errfile"
+			then
+				test_when_finished "rm -f '$errfile'" &&
+				exec 9>"$errfile"
+			fi &&
+			if ! "$@" >&8 2>&9
+			then
+				actual_failure=yes
+			fi
+		fi 8>&1 &&
+		case "$expect_failure,$actual_failure" in
+		yes,)
+			echo >&4 "error: '$@' succeed!"
+			return 1
+			;;
+		,yes)
+			echo >&4 "error: '$@' run into failure!"
+			return 1
+		esac &&
+		if test -n "$outop"
+		then
+			test_line_count "$outop" "$outval" "$outfile" >&4
+		fi &&
+		if test -n "$errop"
+		then
+			test_line_count "$errop" "$errval" "$errfile" >&4
+		fi
+	} 9>&2 2>&4
+}
+
 test_file_size () {
 	test "$#" -ne 1 && BUG "1 param"
 	test-tool path-utils file-size "$1"
-- 
2.32.0.278.gd42b80f139
Previous: Đoàn Trần Công DanhNext: Felipe Contreras
Message 2 of 42 in “t: new helper test_line_count_cmd”
  1. 0/5 t: new helper test_line_count_cmdĐoàn Trần Công Danh, Jun 15, 2021
  2. 1/5 test-lib-functions: introduce test_line_count_cmdĐoàn Trần Công Danh, Jun 15, 2021
  3. Felipe ContrerasJun 17, 2021
  4. 2/5 t6402: use find(1) builtin to filter instead of grepĐoàn Trần Công Danh, Jun 15, 2021
  5. 3/5 t0041: use test_line_count_cmd to check std{out,err}Đoàn Trần Công Danh, Jun 15, 2021
  6. Junio C HamanoJun 16, 2021
  7. Đoàn Trần Công DanhJun 16, 2021
  8. Junio C HamanoJun 17, 2021
  9. 4/5 t6400: use test_line_count_cmd to count # of lines in stdoutĐoàn Trần Công Danh, Jun 15, 2021
  10. 5/5 t6402: use test_line_count_cmd to count # of lines in stdoutĐoàn Trần Công Danh, Jun 15, 2021
  11. 0/4 t: new helper test_line_count_cmdĐoàn Trần Công Danh, Jun 19, 2021
  12. Eric SunshineJun 19, 2021
  13. Junio C HamanoJun 19, 2021
  14. Eric SunshineJun 19, 2021
  15. Junio C HamanoJun 19, 2021
  16. Đoàn Trần Công DanhJun 21, 2021
  17. Eric SunshineJun 22, 2021
  18. 1/4 test-lib-functions: introduce test_line_count_cmdĐoàn Trần Công Danh, Jun 19, 2021
  19. Andrei RybakJun 21, 2021
  20. Andrei RybakJun 24, 2021
  21. 2/4 t6402: use find(1) builtin to filter instead of grepĐoàn Trần Công Danh, Jun 19, 2021
  22. Andrei RybakJun 21, 2021
  23. Đoàn Trần Công DanhJun 21, 2021
  24. 3/4 t6400: use test_line_count_cmd to count # of lines in stdoutĐoàn Trần Công Danh, Jun 19, 2021
  25. 4/4 t6402: use test_line_count_cmd to count # of lines in stdoutĐoàn Trần Công Danh, Jun 19, 2021
  26. 0/2 t640{0,2}: preserve ls-files exit status codeĐoàn Trần Công Danh, Jun 29, 2021
  27. 1/2 t6400: preserve git ls-files exit status codeĐoàn Trần Công Danh, Jun 29, 2021
  28. Eric SunshineJun 29, 2021
  29. Junio C HamanoJun 29, 2021
  30. Eric SunshineJun 30, 2021
  31. Junio C HamanoJun 30, 2021
  32. Đoàn Trần Công DanhJun 30, 2021
  33. Junio C HamanoJun 30, 2021
  34. 2/2 t6402: preserve git exit status codeĐoàn Trần Công Danh, Jun 29, 2021
  35. Junio C HamanoJun 29, 2021
  36. 0/3 new test-libs-function: test_stdout_line_countĐoàn Trần Công Danh, Jul 4, 2021
  37. 1/3 test-lib-functions: introduce test_stdout_line_countĐoàn Trần Công Danh, Jul 4, 2021
  38. Eric SunshineJul 4, 2021
  39. Junio C HamanoJul 6, 2021
  40. Đoàn Trần Công DanhJul 7, 2021
  41. 2/3 t6400: preserve git ls-files exit status codeĐoàn Trần Công Danh, Jul 4, 2021
  42. 3/3 t6402: preserve git exit status codeĐoàn Trần Công Danh, Jul 4, 2021

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.