From: David Bremner <david@tethera.net>
Date: Fri, 24 Jan 2014 15:52:24 +0000 (+2000)
Subject: [PATCH] test: make test_emacs call post-command-hook
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46e48b50bedc489a0e2705de843729161e1cadd1;p=notmuch-archives.git

[PATCH] test: make test_emacs call post-command-hook
---

diff --git a/af/48a2ea41a13b044525446c63ca0827d3ba1213 b/af/48a2ea41a13b044525446c63ca0827d3ba1213
new file mode 100644
index 000000000..5a293b2b6
--- /dev/null
+++ b/af/48a2ea41a13b044525446c63ca0827d3ba1213
@@ -0,0 +1,117 @@
+Return-Path: <bremner@tethera.net>
+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 E1F16431FBC
+	for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 07:52:37 -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 c07M9uD7aWOZ for <notmuch@notmuchmail.org>;
+	Fri, 24 Jan 2014 07:52:33 -0800 (PST)
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 8CF24431FB6
+	for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 07:52:33 -0800 (PST)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <bremner@tethera.net>)
+	id 1W6j3Z-0004ln-1P; Fri, 24 Jan 2014 11:52:33 -0400
+Received: (nullmailer pid 30602 invoked by uid 1000); Fri, 24 Jan 2014
+	15:52:28 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH] test: make test_emacs call post-command-hook
+Date: Fri, 24 Jan 2014 11:52:24 -0400
+Message-Id: <1390578744-30516-1-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 1.8.5.2
+In-Reply-To: <m2lhy5whok.fsf@guru.guru-group.fi>
+References: <m2lhy5whok.fsf@guru.guru-group.fi>
+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 15:52:38 -0000
+
+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 ;).
+
+ 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
+