diff options
| author |  Carl Worth <cworth@cworth.org> | 2010-11-05 17:43:27 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-11-05 17:43:27 -0700 |
| commit | fd16b37dc1b59dac765d459459ce00907506d559 (patch) | |
| tree | 2b683f6956f875e3605c864cb979e078db012060 /test | |
| parent | 484639453a8eee0581d00e7d7da85c31df39c4c8 (diff) | |
test: Don't mess with user's HOME directory
This was too rude of a thing to do and could easily introduce
problems, (as reported by Rob Browning whose environment required some
HOME-specific things for shell startup).
Instead, implement more focused changes to ensure that particular file
in $HOME don't cause problems. Specifically, we fix known problems
with ~/.signature and ~/.mailrc here.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/emacs | 4 | ||||
| -rw-r--r-- | test/test-lib.sh | 26 |
2 files changed, 25 insertions, 5 deletions
@@ -100,7 +100,9 @@ output=$(notmuch search 'subject:"testing message sent via SMTP"' | notmuch_sear test_expect_equal "$output" "thread:XXX 1974-03-29 [1/1] Notmuch Test Suite; Testing message sent via SMTP (inbox unread)" test_begin_subtest "Reply within emacs" -output=$(test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message (buffer-string))' 2>&1 | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/') +# We sed away everything before the ^From in the output to avoid getting +# confused by messages such as "Parsing /home/cworth/.mailrc... done" +output=$(test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message (buffer-string))' 2>&1 | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/') test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org> To: user@example.com Subject: Re: Testing message sent via SMTP diff --git a/test/test-lib.sh b/test/test-lib.sh index 168123a2..8ecc9a08 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -748,7 +748,6 @@ test_emacs () { cat <<EOF > run_emacs #!/bin/sh export PATH=$PATH -export HOME=$HOME export NOTMUCH_CONFIG=$NOTMUCH_CONFIG # We assume that the user will give a command-line argument only if @@ -757,10 +756,30 @@ if [ \$# -gt 0 ]; then BATCH=--batch fi -emacs \$BATCH --no-site-file --directory ../../emacs --load notmuch.el \ +# Here's what we are using here: +# +# --batch: Quit after given commands and print all (messages) +# +# --no-init-file Don't load users ~/.emacs +# +# --no-site-file Don't load the site-wide startup stuff +# +# --directory Ensure that the local notmuch.el source is found +# +# --load Force loading of notmuch.el +# +# notmuch-test-wait Function for tests to use to wait for process completion +# +# message-signature Avoiding appending user's signature on messages +# +# set-frame-width 80 columns (avoids crazy 10-column default of --batch) + +emacs \$BATCH --no-init-file --no-site-file \ + --directory ../../emacs --load notmuch.el \ --eval "(defun notmuch-test-wait () (while (get-buffer-process (current-buffer)) (sleep-for 0.1)))" \ + --eval "(setq message-signature nil)" \ --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)" EOF chmod a+x ./run_emacs @@ -869,8 +888,7 @@ rm -fr "$test" || { } MAIL_DIR="${TMP_DIRECTORY}/mail" -export HOME="${TMP_DIRECTORY}" -export NOTMUCH_CONFIG="${HOME}/notmuch-config" +export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config" mkdir -p "${test}" mkdir -p "${MAIL_DIR}" |