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. --- test/test-lib.el | 12 ++++++++++++ test/test-lib.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/test/test-lib.el b/test/test-lib.el index d26b49f..1c9e224 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)))) @@ -162,3 +164,13 @@ nothing." (t (notmuch-test-report-unexpected output expected))))) + +(defun notmuch-post-command () + (run-hooks 'post-command-hook)) + +(defun notmuch-test-progn (body) + (let (form + ret) + (dolist (form body ret) + (setq ret (eval form)) + (notmuch-post-command)))) diff --git a/test/test-lib.sh b/test/test-lib.sh index d8e0d91..e7833fc 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1075,7 +1075,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() { -- 1.7.9.1