kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t9001: drop save_confirm helper 

The idea of this helper is that we want to save the current
value of a config variable and then restore it again after
the test completes. However, there's no point in actually
saving the value; it should always be restored to the string
"never" (which you can confirm by instrumenting
save_confirm to print the value it finds).

Let's just replace it with a single test_when_finished call.

Suggested-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-03-25 01:32:20 -04:00 committed by Junio C Hamano
parent be86fb3f8d
commit fc99da1fb7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t9001-send-email.sh
View File

@ -817,25 +817,20 @@ test_expect_success $PREREQ '--confirm=compose' '
test_confirm --confirm=compose --compose
'

save_confirm () {
CONFIRM=$(git config --get sendemail.confirm) &&
test_when_finished "git config sendemail.confirm ${CONFIRM:-never}"
}

test_expect_success $PREREQ 'confirm by default (due to cc)' '
save_confirm &&
test_when_finished git config sendemail.confirm never &&
git config --unset sendemail.confirm &&
test_confirm
'

test_expect_success $PREREQ 'confirm by default (due to --compose)' '
save_confirm &&
test_when_finished git config sendemail.confirm never &&
git config --unset sendemail.confirm &&
test_confirm --suppress-cc=all --compose
'

test_expect_success $PREREQ 'confirm detects EOF (inform assumes y)' '
save_confirm &&
test_when_finished git config sendemail.confirm never &&
git config --unset sendemail.confirm &&
rm -fr outdir &&
git format-patch -2 -o outdir &&
@ -848,7 +843,7 @@ test_expect_success $PREREQ 'confirm detects EOF (inform assumes y)' '
'

test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '
save_confirm &&
test_when_finished git config sendemail.confirm never &&
git config sendemail.confirm auto &&
GIT_SEND_EMAIL_NOTTY=1 &&
export GIT_SEND_EMAIL_NOTTY &&
@ -860,7 +855,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '
'

test_expect_success $PREREQ 'confirm does not loop forever' '
save_confirm &&
test_when_finished git config sendemail.confirm never &&
git config sendemail.confirm auto &&
GIT_SEND_EMAIL_NOTTY=1 &&
export GIT_SEND_EMAIL_NOTTY &&