Skip to contentSkip to conversation

t1308-config-set: fix a test that has a typo

PATCH In review Johannes Schindelin via GitGitGadget 3 participants 4 messages Oct 10, 2019 – Oct 11, 2019

lore
Share & tools
lore
#0 lore raw

cover t1308-config-set: fix a test that has a typo

I am currently trying to whittle down the number of open PRs at
https://github.com/git/git, and this is one of the patches I deem valuable enough (and complete enough) to put through to the Git mailing list even when the original contributor has gone silent.

Tanay Abhra (1):
t1308-config-set: fix a test that has a typo

 t/t1308-config-set.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

base-commit: 70bf0b755af4d1e66da25b7805cac0e481a082e4
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-387%2Fdscho%2Fconfig-set-test-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-387/dscho/config-set-test-fix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/387

Signature · 1 line
gitgitgadget
#1 lore raw

PATCH 1/1 t1308-config-set: fix a test that has a typo

From: Tanay Abhra <[email protected]>

Change test 'find value_list for a key from a configset' to redirect the result to 'expect' instead of 'except' which was a typo.

With this change, the test case actually fails because it uses configset_get_value. Clearly, this was intended to be configset_get_value_multi since the test expects a list of values instead of a single value, so let's fix that, too.

Originally contributed as https://github.com/git/git/pull/451.

---
 t/t1308-config-set.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
t/t1308-config-set.sh +4 -4
index d0a2727b85..7b4e1a63eb 100755
@@ -166,14 +166,14 @@ test_expect_success 'find value with highest priority from a configset' '
 '
 
 test_expect_success 'find value_list for a key from a configset' '
-	cat >except <<-\EOF &&
+	cat >expect <<-\EOF &&
+	lama
+	ball
 	sam
 	bat
 	hask
-	lama
-	ball
 	EOF
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
+	test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
 	test_cmp expect actual
 '
 
Signature · 1 line
gitgitgadget
#2 lore raw

Team,

t/t1308-config-set.sh test_expect_success 'find value with highest priority from a configset' ' · line 169

Quoted 10 lines · Tanay Abhra via GitGitGadget
t/t1308-config-set.sh +1 -1
index d0a2727b85..7b4e1a63eb 100755
@@ -166,14 +166,14 @@ test_expect_success 'find value with highest priority from a configset' '
 '
 
 test_expect_success 'find value_list for a key from a configset' '
-	cat >except <<-\EOF &&
+	cat >expect <<-\EOF &&

I should note that I looked through all of the hits of git grep -w except -- t/ and did not find any other typo.

Thanks,
Johannes

Quoted 16 lines
t/t1308-config-set.sh +3 -4
+	lama
+	ball
 	sam
 	bat
 	hask
-	lama
-	ball
 	EOF
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
+	test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
 	test_cmp expect actual
 '
 
--

gitgitgadget

#3 lore raw
Quoted 2 lines · Johannes Schindelin

I should note that I looked through all of the hits of git grep -w except -- t/ and did not find any other typo.

Thanks.