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

[PATCH v2 06/26] test: completion: add run_func() helper

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Nov 10, 2020, 21:21 UTC
Message-ID
<20201110212136.870769-7-felipe.contreras@gmail.com>
In-Reply-To
<20201110212136.870769-1-felipe.contreras@gmail.com>
Pretty straightforward: runs functions.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t9902-completion.sh | 58 ++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 2e04462bb0..3ec9ff9308 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -75,6 +75,12 @@ run_completion ()
 	__git_wrap__git_main && print_comp
 }
 
+run_func ()
+{
+	local -a COMPREPLY &&
+	"$@" && print_comp
+}
+
 # Test high-level completion
 # Arguments are:
 # 1: typed text so far (cur)
@@ -452,8 +458,7 @@ test_expect_success '__gitcomp_direct - puts everything into COMPREPLY as-is' '
 	EOF
 	(
 		cur=should_be_ignored &&
-		__gitcomp_direct "$(cat expected)" &&
-		print_comp
+		run_func __gitcomp_direct "$(cat expected)"
 	) &&
 	test_cmp expected out
 '
@@ -547,7 +552,7 @@ test_expect_success '__gitcomp - equal skip' '
 '
 
 test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
-	__gitcomp "$invalid_variable_name"
+	run_func __gitcomp "$invalid_variable_name"
 '
 
 read -r -d "" refs <<-\EOF
@@ -586,7 +591,7 @@ test_expect_success '__gitcomp_nl - no suffix' '
 '
 
 test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name' '
-	__gitcomp_nl "$invalid_variable_name"
+	run_func __gitcomp_nl "$invalid_variable_name"
 '
 
 test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from config file' '
@@ -1086,8 +1091,7 @@ test_expect_success '__git_complete_refs - simple' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs &&
-		print_comp
+		run_func __git_complete_refs
 	) &&
 	test_cmp expected out
 '
@@ -1099,8 +1103,7 @@ test_expect_success '__git_complete_refs - matching' '
 	EOF
 	(
 		cur=mat &&
-		__git_complete_refs &&
-		print_comp
+		run_func __git_complete_refs
 	) &&
 	test_cmp expected out
 '
@@ -1113,8 +1116,7 @@ test_expect_success '__git_complete_refs - remote' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --remote=other &&
-		print_comp
+		run_func __git_complete_refs --remote=other
 	) &&
 	test_cmp expected out
 '
@@ -1132,8 +1134,7 @@ test_expect_success '__git_complete_refs - track' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --track &&
-		print_comp
+		run_func __git_complete_refs --track
 	) &&
 	test_cmp expected out
 '
@@ -1145,8 +1146,7 @@ test_expect_success '__git_complete_refs - current word' '
 	EOF
 	(
 		cur="--option=mat" &&
-		__git_complete_refs --cur="${cur#*=}" &&
-		print_comp
+		run_func __git_complete_refs --cur="${cur#*=}"
 	) &&
 	test_cmp expected out
 '
@@ -1158,8 +1158,7 @@ test_expect_success '__git_complete_refs - prefix' '
 	EOF
 	(
 		cur=v1.0..mat &&
-		__git_complete_refs --pfx=v1.0.. --cur=mat &&
-		print_comp
+		run_func __git_complete_refs --pfx=v1.0.. --cur=mat
 	) &&
 	test_cmp expected out
 '
@@ -1175,8 +1174,7 @@ test_expect_success '__git_complete_refs - suffix' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --sfx=. &&
-		print_comp
+		run_func __git_complete_refs --sfx=.
 	) &&
 	test_cmp expected out
 '
@@ -1189,8 +1187,7 @@ test_expect_success '__git_complete_fetch_refspecs - simple' '
 	EOF
 	(
 		cur= &&
-		__git_complete_fetch_refspecs other &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other
 	) &&
 	test_cmp expected out
 '
@@ -1201,8 +1198,7 @@ test_expect_success '__git_complete_fetch_refspecs - matching' '
 	EOF
 	(
 		cur=br &&
-		__git_complete_fetch_refspecs other "" br &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "" br
 	) &&
 	test_cmp expected out
 '
@@ -1215,8 +1211,7 @@ test_expect_success '__git_complete_fetch_refspecs - prefix' '
 	EOF
 	(
 		cur="+" &&
-		__git_complete_fetch_refspecs other "+" ""  &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "+" ""
 	) &&
 	test_cmp expected out
 '
@@ -1229,8 +1224,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
 	EOF
 	(
 		cur=refs/ &&
-		__git_complete_fetch_refspecs other "" refs/ &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "" refs/
 	) &&
 	test_cmp expected out
 '
@@ -1243,8 +1237,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
 	EOF
 	(
 		cur=+refs/ &&
-		__git_complete_fetch_refspecs other + refs/ &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other + refs/
 	) &&
 	test_cmp expected out
 '
@@ -1775,8 +1768,7 @@ test_path_completion ()
 		# unusual characters in path names.  By requesting only
 		# untracked files we do not have to bother adding any
 		# paths to the index in those tests.
-		__git_complete_index_file --others &&
-		print_comp
+		run_func __git_complete_index_file --others
 	) &&
 	test_cmp expected out
 }
@@ -2261,8 +2253,7 @@ do
 		(
 			words=(git push '$flag' other ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_complete_remote_or_refspec &&
-			print_comp
+			run_func __git_complete_remote_or_refspec
 		) &&
 		test_cmp expected out
 	'
@@ -2274,8 +2265,7 @@ do
 		(
 			words=(git push other '$flag' ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_complete_remote_or_refspec &&
-			print_comp
+			run_func __git_complete_remote_or_refspec
 		) &&
 		test_cmp expected out
 	'

-- 
2.29.2
Previous: Felipe ContrerasNext: Junio C Hamano
Message 10 of 36 in “completion: bash: a bunch of fixes, cleanups, and reorganization”
  1. 00/26 completion: bash: a bunch of fixes, cleanups, and reorganizationFelipe Contreras, Nov 10, 2020
  2. 01/26 completion: bash: fix prefix detection in branch.*Felipe Contreras, Nov 10, 2020
  3. SZEDER GáborNov 25, 2020
  4. Junio C HamanoNov 25, 2020
  5. Felipe ContrerasNov 25, 2020
  6. 02/26 completion: bash: add correct suffix in variablesFelipe Contreras, Nov 10, 2020
  7. 03/26 completion: bash: fix for suboptions with valueFelipe Contreras, Nov 10, 2020
  8. 04/26 completion: bash: do not modify COMP_WORDBREAKSFelipe Contreras, Nov 10, 2020
  9. 05/26 test: completion: fix currently typed wordsFelipe Contreras, Nov 10, 2020
  10. 06/26 test: completion: add run_func() helperFelipe Contreras, Nov 10, 2020
  11. Junio C HamanoNov 11, 2020
  12. Felipe ContrerasNov 11, 2020
  13. Junio C HamanoNov 11, 2020
  14. Felipe ContrerasNov 12, 2020
  15. 07/26 completion: bash: remove non-append functionalityFelipe Contreras, Nov 10, 2020
  16. 08/26 completion: bash: get rid of _append() functionsFelipe Contreras, Nov 10, 2020
  17. 10/26 completion: bash: factor out check in __gitcompFelipe Contreras, Nov 10, 2020
  18. 09/26 completion: bash: get rid of any non-append codeFelipe Contreras, Nov 10, 2020
  19. 11/26 completion: bash: simplify equal suffix checkFelipe Contreras, Nov 10, 2020
  20. 12/26 completion: bash: refactor __gitcompFelipe Contreras, Nov 10, 2020
  21. Junio C HamanoNov 12, 2020
  22. Felipe ContrerasNov 12, 2020
  23. 13/26 completion: bash: simplify __gitcompFelipe Contreras, Nov 10, 2020
  24. 15/26 completion: bash: improve __gitcomp suffix codeFelipe Contreras, Nov 10, 2020
  25. 14/26 completion: bash: change suffix check in __gitcompFelipe Contreras, Nov 10, 2020
  26. 16/26 completion: bash: simplify config_variable_nameFelipe Contreras, Nov 10, 2020
  27. 17/26 test: completion: switch __gitcomp_nl prefix testFelipe Contreras, Nov 10, 2020
  28. 18/26 completion: bash: simplify _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  29. 19/26 completion: bash: refactor _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  30. 20/26 completion: bash: cleanup _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  31. 21/26 completion: bash: trivial cleanupFelipe Contreras, Nov 10, 2020
  32. 22/26 completion: bash: rename _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  33. 23/26 completion: bash: improve __gitcomp descriptionFelipe Contreras, Nov 10, 2020
  34. 24/26 completion: bash: add __gitcomp_optsFelipe Contreras, Nov 10, 2020
  35. 25/26 completion: bash: cleanup __gitcomp* invocationsFelipe Contreras, Nov 10, 2020
  36. 26/26 completion: bash: shuffle __gitcomp functionsFelipe Contreras, Nov 10, 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.