Hi On Wed, 22 Jan 2014, David Bremner <david@tethera.net> wrote: > From: Mark Walters <markwalters1009@gmail.com> > > 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. > --- > > What do you think about this alternate version? it allows > notmuch-test-progn to have the same syntax as progn. It seems about > the same level of complexity to me; fwiw I prefer the let over the > dolist/setq. This looks much nicer: a macro is definitely the right way to do this. I might be inclined to replace the let... by a prog1 but would be happy either way on that. Best wishes Mark > > test/test-lib.el | 13 +++++++++++++ > test/test-lib.sh | 2 +- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/test/test-lib.el b/test/test-lib.el > index 37fcb3d..a12ad97 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)))) > > @@ -165,3 +167,14 @@ 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) `(let ((ret ,x)) > + (notmuch-post-command) > + ret)) > + body))) > diff --git a/test/test-lib.sh b/test/test-lib.sh > index 78af170..27dcb59 100644 > --- a/test/test-lib.sh > +++ b/test/test-lib.sh > @@ -1118,7 +1118,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.8.5.2