diff options
author | David Bremner <david@tethera.net> | 2014-05-09 01:20:07 +0100 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2014-07-13 12:33:53 -0300 |
commit | eed6c75556e18d943ac690598edceef0c4ee59d5 (patch) | |
tree | b07f2fa552d330dba8374d3855a93694328c7b11 /test | |
parent | bc180bd388f4c2335ff2d15db9bf91d1f7de1bce (diff) |
test: make test_emacs call post-command-hook
The unread/read changes will use the post-command-hook. test_emacs
does not call the post-command-hook. This adds a notmuch-test-progn
which takes a list of commands as argument and executes them in turn
but runs the post-command-hook after each one.
The caller can batch operations (ie to stop post-command-hook from
being interleaved) by wrapping the batch of operations inside a progn.
We also explicitly run the post-command-hook before getting the output
from a test; this makes sense as this will be a place the user would
be seeing the information.
Diffstat (limited to 'test')
-rw-r--r-- | test/test-lib.el | 11 | ||||
-rw-r--r-- | test/test-lib.sh | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/test/test-lib.el b/test/test-lib.el index 437f83f4..36afe630 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -52,11 +52,13 @@ (defun test-output (&optional filename) "Save current buffer to file FILENAME. Default FILENAME is OUTPUT." + (notmuch-post-command) (write-region (point-min) (point-max) (or filename "OUTPUT"))) (defun test-visible-output (&optional filename) "Save visible text in current buffer to file FILENAME. Default FILENAME is OUTPUT." + (notmuch-post-command) (let ((text (visible-buffer-string))) (with-temp-file (or filename "OUTPUT") (insert text)))) @@ -166,6 +168,15 @@ nothing." (t (notmuch-test-report-unexpected output expected))))) +(defun notmuch-post-command () + (run-hooks 'post-command-hook)) + +(defmacro notmuch-test-progn (&rest body) + (cons 'progn + (mapcar + (lambda (x) `(prog1 ,x (notmuch-post-command))) + body))) + ;; For historical reasons, we hide deleted tags by default in the test ;; suite (setq notmuch-tag-deleted-formats diff --git a/test/test-lib.sh b/test/test-lib.sh index 17deaaba..b9b8fe8c 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1138,7 +1138,7 @@ test_emacs () { rm -f OUTPUT touch OUTPUT - ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)" + ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)" } test_python() { |