mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-28 21:54:10 +01:00
test-lib.sh: "tidied" emacs_deliver_message ()
Added initialization and checking of smtp_dummy_port like it was done with smtp_dummy_pid. Made those function-local variables. One 8 spaces to tab consistency conversion. And last, but definitely not least; while doing above noticed that there were quite a few double-quoted strings where $@ was in the middle of it -- replaced those with $* for robustness ("...$@..." expands params to separate words, "...$*..." params expands to single word).
This commit is contained in:
parent
f33053023b
commit
a1aea7272e
1 changed files with 7 additions and 6 deletions
|
@ -320,10 +320,11 @@ emacs_deliver_message ()
|
|||
shift 2
|
||||
# before we can send a message, we have to prepare the FCC maildir
|
||||
mkdir -p "$MAIL_DIR"/sent/{cur,new,tmp}
|
||||
# eval'ing smtp-dummy --background will set smtp_dummy_pid
|
||||
smtp_dummy_pid=
|
||||
# eval'ing smtp-dummy --background will set smtp_dummy_pid and -_port
|
||||
local smtp_dummy_pid= smtp_dummy_port=
|
||||
eval `$TEST_DIRECTORY/smtp-dummy --background sent_message`
|
||||
test -n "$smtp_dummy_pid" || return 1
|
||||
test -n "$smtp_dummy_port" || return 1
|
||||
|
||||
test_emacs \
|
||||
"(let ((message-send-mail-function 'message-smtpmail-send-it)
|
||||
|
@ -337,7 +338,7 @@ emacs_deliver_message ()
|
|||
(insert \"${subject}\")
|
||||
(message-goto-body)
|
||||
(insert \"${body}\")
|
||||
$@
|
||||
$*
|
||||
(notmuch-mua-send-and-exit))"
|
||||
|
||||
# In case message was sent properly, client waits for confirmation
|
||||
|
@ -381,7 +382,7 @@ emacs_fcc_message ()
|
|||
(insert \"${subject}\")
|
||||
(message-goto-body)
|
||||
(insert \"${body}\")
|
||||
$@
|
||||
$*
|
||||
(notmuch-mua-send-and-exit))" || return 1
|
||||
notmuch new $nmn_args >/dev/null
|
||||
}
|
||||
|
@ -999,7 +1000,7 @@ test_emacs () {
|
|||
rm -f OUTPUT
|
||||
touch OUTPUT
|
||||
|
||||
${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)"
|
||||
${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $*)"
|
||||
}
|
||||
|
||||
test_python() {
|
||||
|
|
Loading…
Reference in a new issue