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

Re: [PATCH v5 3/5][Outreachy] t7102,t7201: remove whitespace after redirect operator

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 22, 2020, 05:55 UTC
Message-ID
<xmqqh7qmolch.fsf@gitster.c.googlers.com>
In-Reply-To
<xmqq36264xx5.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
> Also, this is outside any test_expect_*, which is unusual in
> modernized test scripts.  There are many other instances of
> preparing expected output outside test_expect_* in this file,
> so we may need another patch to clean them up.
>
> For now, within the context of this patch, let's just fix the space
> after the << here-doc redirection operator, as you spotted.  The
> attached I'll squash into this patch.
And the other clean-up patch would look like this.
--- >8 ---
Subject: t7102: prepare expected output inside test_expect_* block

That way we can notice if there is a breakage/bug in the parts of the test that prepare the expected outcome, which is how modern tests are arranged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t7102-reset.sh | 244 +++++++++++++++++++++++++++----------------------------
 1 file changed, 121 insertions(+), 123 deletions(-)
diff --git c/t/t7102-reset.sh w/t/t7102-reset.sh
index 07acaa2beb..821e8bb94d 100755
--- c/t/t7102-reset.sh
+++ w/t/t7102-reset.sh
@@ -82,15 +82,15 @@ test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
 	test_i18ncmp .expected .actual
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-
 test_expect_success 'giving a non existing revision should fail' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+
 	test_must_fail git reset aaaaaa &&
 	test_must_fail git reset --mixed aaaaaa &&
 	test_must_fail git reset --soft aaaaaa &&
@@ -191,38 +191,38 @@ test_expect_success 'resetting to HEAD with no changes should succeed and do not
 		check_changes $head5
 '
 
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/secondfile b/secondfile
-index $head5p1s..$head5s 100644
---- a/secondfile
-+++ b/secondfile
-@@ -1 +1,2 @@
--2nd file
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success '--soft reset only should show changes in diff --cached' '
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/secondfile b/secondfile
+	index $head5p1s..$head5s 100644
+	--- a/secondfile
+	+++ b/secondfile
+	@@ -1 +1,2 @@
+	-2nd file
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset --soft HEAD^ &&
 	check_changes $head5p1 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line 2nd file
-EOF
 test_expect_success 'changing files and redo the last commit should succeed' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line 2nd file
+	EOF
 	echo "3rd line 2nd file" >>secondfile &&
 	git commit -a -C ORIG_HEAD &&
 	head4=$(git rev-parse --verify HEAD) &&
@@ -231,54 +231,54 @@ test_expect_success 'changing files and redo the last commit should succeed' '
 			$head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-first:
-1st file
-2nd line 1st file
-second:
-2nd file
-EOF
 test_expect_success '--hard reset should change the files and undo commits permanently' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	first:
+	1st file
+	2nd line 1st file
+	second:
+	2nd file
+	EOF
 	git reset --hard HEAD~2 &&
 	check_changes $head5p2 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head4
 '
 
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/first b/first
-deleted file mode 100644
-index $head5p2f..0000000
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index $head5p1s..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-diff --git a/secondfile b/secondfile
-new file mode 100644
-index 0000000..$head5s
---- /dev/null
-+++ b/secondfile
-@@ -0,0 +1,2 @@
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success 'redoing changes adding them without commit them should succeed' '
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	diff --git a/secondfile b/secondfile
+	new file mode 100644
+	index 0000000..$head5s
+	--- /dev/null
+	+++ b/secondfile
+	@@ -0,0 +1,2 @@
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git rm first &&
 	git mv second secondfile &&
 
@@ -288,46 +288,45 @@ test_expect_success 'redoing changes adding them without commit them should succ
 	check_changes $head5p2
 '
 
-cat >.diff_expect <<EOF
-diff --git a/first b/first
-deleted file mode 100644
-index $head5p2f..0000000
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index $head5p1s..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-EOF
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success '--mixed reset to HEAD should unadd the files' '
+	cat >.diff_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset &&
 	check_changes $head5p2 &&
 	test "$(git rev-parse ORIG_HEAD)" = $head5p2
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success 'redoing the last two commits should succeed' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git add secondfile &&
 	git reset --hard $head5p2 &&
-
 	git rm first &&
 	git mv second secondfile &&
 	git commit -a -m "remove 1st and rename 2nd" &&
@@ -340,15 +339,15 @@ test_expect_success 'redoing the last two commits should succeed' '
 	check_changes $head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line in branch2
-EOF
 test_expect_success '--hard reset to HEAD should clear a failed merge' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line in branch2
+	EOF
 	git branch branch1 &&
 	git branch branch2 &&
 
@@ -366,14 +365,14 @@ test_expect_success '--hard reset to HEAD should clear a failed merge' '
 	check_changes $head3
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset --hard HEAD^ &&
 	check_changes $head5 &&
 
@@ -460,12 +459,11 @@ test_expect_success 'resetting an unmodified path is a no-op' '
 	git diff-index --cached --exit-code HEAD
 '
 
-cat >expect <<EOF
-Unstaged changes after reset:
-M	file2
-EOF
-
 test_expect_success '--mixed refreshes the index' '
+	cat >expect <<-\EOF &&
+	Unstaged changes after reset:
+	M	file2
+	EOF
 	echo 123 >> file2 &&
 	git reset --mixed HEAD >output &&
 	test_i18ncmp expect output
Previous: Eric SunshineNext: Eric Sunshine
Message 49 of 60 in “[Outreachy] modernizing the test scripts”
  1. 0/5 [Outreachy] modernizing the test scriptscharvi-077, Oct 15, 2020
  2. 1/5 [Outreachy] t7101,t7102,t7201: modernize test formattingcharvi-077, Oct 15, 2020
  3. Christian CouderOct 16, 2020
  4. 2/5 [Outreachy] t7102,t7201: remove unnecessary blank spaces in test bodycharvi-077, Oct 15, 2020
  5. 3/5 [Outreachy] t7102,t7201: remove whitespace after redirect operatorcharvi-077, Oct 15, 2020
  6. 4/5 [Outreachy] t7201: avoid using cd outside of subshellscharvi-077, Oct 15, 2020
  7. 5/5 [Outreachy] t7201: place each command in its own linecharvi-077, Oct 15, 2020
  8. Christian CouderOct 16, 2020
  9. Charvi MendirattaOct 17, 2020
  10. 0/5 [Outreachy] modernizing the test scriptsCharvi Mendiratta, Oct 17, 2020
  11. 1/5 [Outreachy] t7101,t7102,t7201: modernize test formattingCharvi Mendiratta, Oct 17, 2020
  12. 2/5 [Outreachy] t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta, Oct 17, 2020
  13. Đoàn Trần Công DanhOct 17, 2020
  14. Charvi MendirattaOct 18, 2020
  15. 3/5 [Outreachy] t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta, Oct 17, 2020
  16. 4/5 [Outreachy] t7201: avoid using cd outside of subshellsCharvi Mendiratta, Oct 17, 2020
  17. Phillip WoodOct 18, 2020
  18. Charvi MendirattaOct 19, 2020
  19. Phillip WoodOct 19, 2020
  20. Charvi MendirattaOct 19, 2020
  21. Taylor BlauOct 19, 2020
  22. Charvi MendirattaOct 20, 2020
  23. Taylor BlauOct 20, 2020
  24. Phillip WoodOct 20, 2020
  25. Charvi MendirattaOct 20, 2020
  26. 5/5 [Outreachy] t7201: place each command in its own lineCharvi Mendiratta, Oct 17, 2020
  27. 0/5 [Outreachy] modernize the test scriptsCharvi Mendiratta, Oct 20, 2020
  28. 1/5 [Outreachy] t7101,t7102,t7201: modernize test formattingCharvi Mendiratta, Oct 20, 2020
  29. 2/5 [Outreachy] t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta, Oct 20, 2020
  30. 3/5 [Outreachy] t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta, Oct 20, 2020
  31. 4/5 [Outreachy] t7201: use 'git -C' to avoid subshellCharvi Mendiratta, Oct 20, 2020
  32. 5/5 [Outreachy] t7201: put each command on a seperate lineCharvi Mendiratta, Oct 20, 2020
  33. t7201: put each command on a separate lineCharvi Mendiratta, Oct 20, 2020
  34. Junio C HamanoOct 20, 2020
  35. Taylor BlauOct 20, 2020
  36. Junio C HamanoOct 20, 2020
  37. Taylor BlauOct 20, 2020
  38. Junio C HamanoOct 20, 2020
  39. Charvi MendirattaOct 21, 2020
  40. Junio C HamanoOct 20, 2020
  41. Charvi MendirattaOct 21, 2020
  42. 0/5 [Outreachy] modernize the test scriptsCharvi Mendiratta, Oct 21, 2020
  43. 1/5 [Outreachy] t7101,t7102,t7201: modernize test formattingCharvi Mendiratta, Oct 21, 2020
  44. 2/5 [Outreachy] t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta, Oct 21, 2020
  45. 3/5 [Outreachy] t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta, Oct 21, 2020
  46. Eric SunshineOct 21, 2020
  47. Junio C HamanoOct 22, 2020
  48. Eric SunshineOct 22, 2020
  49. Junio C HamanoOct 22, 2020
  50. Eric SunshineOct 22, 2020
  51. Junio C HamanoOct 22, 2020
  52. Charvi MendirattaOct 22, 2020
  53. 4/5 [Outreachy] t7201: use 'git -C' to avoid subshellCharvi Mendiratta, Oct 21, 2020
  54. 5/5 [Outreachy] t7201: put each command on a separate lineCharvi Mendiratta, Oct 21, 2020
  55. 0/5 [Outreachy] modernize test scriptsCharvi Mendiratta, Oct 22, 2020
  56. 1/5 [Outreachy] t7101,t7102,t7201: modernize test formattingCharvi Mendiratta, Oct 22, 2020
  57. 2/5 [Outreachy] t7102,t7201: remove unnecessary blank spaces in test bodyCharvi Mendiratta, Oct 22, 2020
  58. 3/5 [Outreachy] t7102,t7201: remove whitespace after redirect operatorCharvi Mendiratta, Oct 22, 2020
  59. 4/5 [Outreachy] t7201: use 'git -C' to avoid subshellCharvi Mendiratta, Oct 22, 2020
  60. 5/5 [Outreachy] t7201: put each command on a separate lineCharvi Mendiratta, Oct 22, 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.