From 307b35a1f1bee6b17383c2ef07eba5e7c79e1a48 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 24 Jan 2014 20:34:46 +0200
Subject: [PATCH] Re: [PATCH] test: make test_emacs call post-command-hook

---
 2d/9d88093d4a2ab8958781f861bab0481bddda25 | 132 ++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 2d/9d88093d4a2ab8958781f861bab0481bddda25

diff --git a/2d/9d88093d4a2ab8958781f861bab0481bddda25 b/2d/9d88093d4a2ab8958781f861bab0481bddda25
new file mode 100644
index 000000000..14efc8652
--- /dev/null
+++ b/2d/9d88093d4a2ab8958781f861bab0481bddda25
@@ -0,0 +1,132 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 40346431FBC
+	for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 10:35:02 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 9AxkDLvvpsJj for <notmuch@notmuchmail.org>;
+	Fri, 24 Jan 2014 10:34:53 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id A99A8431FB6
+	for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 10:34:53 -0800 (PST)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 346C81000B3;
+	Fri, 24 Jan 2014 20:34:46 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
+Subject: Re: [PATCH] test: make test_emacs call post-command-hook
+In-Reply-To: <1390578744-30516-1-git-send-email-david@tethera.net>
+References: <m2lhy5whok.fsf@guru.guru-group.fi>
+	<1390578744-30516-1-git-send-email-david@tethera.net>
+User-Agent: Notmuch/0.17+41~g8e7fabf (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Fri, 24 Jan 2014 20:34:46 +0200
+Message-ID: <m21tzxns8p.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Fri, 24 Jan 2014 18:35:02 -0000
+
+On Fri, Jan 24 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.
+> ---
+>
+> OK, OK, so the previous version re-invented prog1. That's the scheme
+> way ;).
+
+LGTM.
+
+Tomi
+
+
+>
+>  test/test-lib.el | 11 +++++++++++
+>  test/test-lib.sh |  2 +-
+>  2 files changed, 12 insertions(+), 1 deletion(-)
+>
+> diff --git a/test/test-lib.el b/test/test-lib.el
+> index 37fcb3d..0ee8371 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,12 @@ 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)))
+> 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
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch
-- 
2.26.2