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

diff --git a/af/48a2ea41a13b044525446c63ca0827d3ba1213 b/af/48a2ea41a13b044525446c63ca0827d3ba1213
new file mode 100644 (file)
index 0000000..5a293b2
--- /dev/null
+++ b/af/48a2ea41a13b044525446c63ca0827d3ba1213
@@ -0,0 +1,117 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E1F16431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 07:52:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id c07M9uD7aWOZ for <notmuch@notmuchmail.org>;\r
+       Fri, 24 Jan 2014 07:52:33 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8CF24431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 07:52:33 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1W6j3Z-0004ln-1P; Fri, 24 Jan 2014 11:52:33 -0400\r
+Received: (nullmailer pid 30602 invoked by uid 1000); Fri, 24 Jan 2014\r
+       15:52:28 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: make test_emacs call post-command-hook\r
+Date: Fri, 24 Jan 2014 11:52:24 -0400\r
+Message-Id: <1390578744-30516-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <m2lhy5whok.fsf@guru.guru-group.fi>\r
+References: <m2lhy5whok.fsf@guru.guru-group.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 24 Jan 2014 15:52:38 -0000\r
+\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+\r
+The unread/read changes will use the post-command-hook. test_emacs\r
+does not call the post-command-hook. This adds a notmuch-test-progn\r
+which takes a list of commands as argument and executes them in turn\r
+but runs the post-command-hook after each one.\r
+\r
+The caller can batch operations (ie to stop post-command-hook from\r
+being interleaved) by wrapping the batch of operations inside a progn.\r
+\r
+We also explicitly run the post-command-hook before getting the output\r
+from a test; this makes sense as this will be a place the user would\r
+be seeing the information.\r
+---\r
+\r
+OK, OK, so the previous version re-invented prog1. That's the scheme\r
+way ;).\r
+\r
+ test/test-lib.el | 11 +++++++++++\r
+ test/test-lib.sh |  2 +-\r
+ 2 files changed, 12 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 37fcb3d..0ee8371 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -52,11 +52,13 @@\r
+ \r
+ (defun test-output (&optional filename)\r
+   "Save current buffer to file FILENAME.  Default FILENAME is OUTPUT."\r
++  (notmuch-post-command)\r
+   (write-region (point-min) (point-max) (or filename "OUTPUT")))\r
+ \r
+ (defun test-visible-output (&optional filename)\r
+   "Save visible text in current buffer to file FILENAME.  Default\r
+ FILENAME is OUTPUT."\r
++  (notmuch-post-command)\r
+   (let ((text (visible-buffer-string)))\r
+     (with-temp-file (or filename "OUTPUT") (insert text))))\r
+ \r
+@@ -165,3 +167,12 @@ nothing."\r
+ \r
+      (t\r
+       (notmuch-test-report-unexpected output expected)))))\r
++\r
++(defun notmuch-post-command ()\r
++  (run-hooks 'post-command-hook))\r
++\r
++(defmacro notmuch-test-progn (&rest body)\r
++  (cons 'progn\r
++      (mapcar\r
++       (lambda (x) `(prog1 ,x (notmuch-post-command)))\r
++       body)))\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 78af170..27dcb59 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1118,7 +1118,7 @@ test_emacs () {\r
+       rm -f OUTPUT\r
+       touch OUTPUT\r
+ \r
+-      ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)"\r
++      ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)"\r
+ }\r
+ \r
+ test_python() {\r
+-- \r
+1.8.5.2\r
+\r