aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/test-lib.sh
diff options
context:
space:
mode:
authorGravatar Dmitry Kurochkin <dmitry.kurochkin@gmail.com>2011-06-28 08:45:09 +0400
committerGravatar Carl Worth <cworth@cworth.org>2011-06-28 15:06:47 -0700
commit0cc5483a9cc496bbaa1a6aef03e99b4a7686f779 (patch)
tree28f6262cd232195b3945b6341d487f129ddc5362 /test/test-lib.sh
parent0417c1fad67440756aa789c40fbb5153a98f4ca0 (diff)
test: set variables using `let' instead of `setq' in Emacs tests
Using `setq' for setting variables in Emacs tests affect other tests that may run in the same Emacs environment. Currently it works because each test is run in a separate Emacs instance. But in the future multiple tests will run in a single Emacs instance. The patch changes all variables to use `let', so the scope of the change is limited to a single test.
Diffstat (limited to 'test/test-lib.sh')
-rwxr-xr-xtest/test-lib.sh27
1 files changed, 14 insertions, 13 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh
index ad1506c9..7c8a86f6 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -394,19 +394,20 @@ emacs_deliver_message ()
mkdir -p "$MAIL_DIR"/sent/{cur,new,tmp}
../smtp-dummy sent_message &
smtp_dummy_pid=$!
- test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it)
- (setq smtpmail-smtp-server \"localhost\")
- (setq smtpmail-smtp-service \"25025\")
- (notmuch-hello)
- (notmuch-mua-mail)
- (message-goto-to)
- (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\")
- (message-goto-subject)
- (insert \"${subject}\")
- (message-goto-body)
- (insert \"${body}\")
- $@
- (message-send-and-exit)" >/dev/null 2>&1
+ test_emacs \
+ "(let ((message-send-mail-function 'message-smtpmail-send-it)
+ (smtpmail-smtp-server \"localhost\")
+ (smtpmail-smtp-service \"25025\"))
+ (notmuch-hello)
+ (notmuch-mua-mail)
+ (message-goto-to)
+ (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\")
+ (message-goto-subject)
+ (insert \"${subject}\")
+ (message-goto-body)
+ (insert \"${body}\")
+ $@
+ (message-send-and-exit))" >/dev/null 2>&1
wait ${smtp_dummy_pid}
notmuch new >/dev/null
}