debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Don't mess with user's HOME directory

Browse source 
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.
This commit is contained in:
Carl Worth 2010-11-05 17:43:27 -07:00
parent 484639453a
commit fd16b37dc1
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/emacs
View file

@ -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_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" 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> test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: user@example.com To: user@example.com
Subject: Re: Testing message sent via SMTP Subject: Re: Testing message sent via SMTP

26
test/test-lib.sh
View file

@ -748,7 +748,6 @@ test_emacs () {
cat <<EOF > run_emacs cat <<EOF > run_emacs
#!/bin/sh #!/bin/sh
export PATH=$PATH export PATH=$PATH
export HOME=$HOME
export NOTMUCH_CONFIG=$NOTMUCH_CONFIG export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
# We assume that the user will give a command-line argument only if # We assume that the user will give a command-line argument only if
@ -757,10 +756,30 @@ if [ \$# -gt 0 ]; then
BATCH=--batch BATCH=--batch
fi 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 () --eval "(defun notmuch-test-wait ()
(while (get-buffer-process (current-buffer)) (while (get-buffer-process (current-buffer))
(sleep-for 0.1)))" \ (sleep-for 0.1)))" \
--eval "(setq message-signature nil)" \
--eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)" --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)"
EOF EOF
chmod a+x ./run_emacs chmod a+x ./run_emacs
@ -869,8 +888,7 @@ rm -fr "$test" || {
} }
MAIL_DIR="${TMP_DIRECTORY}/mail" MAIL_DIR="${TMP_DIRECTORY}/mail"
export HOME="${TMP_DIRECTORY}" export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
export NOTMUCH_CONFIG="${HOME}/notmuch-config"
mkdir -p "${test}" mkdir -p "${test}"
mkdir -p "${MAIL_DIR}" mkdir -p "${MAIL_DIR}"