[Patch v3 1/3] test: make test_emacs call post-command-hook

diff --git a/50/e45ed9e632624cf7499a96eb77dc7af919ea4f b/50/e45ed9e632624cf7499a96eb77dc7af919ea4f
new file mode 100644 (file)
index 0000000..c065ab4
--- /dev/null
+++ b/50/e45ed9e632624cf7499a96eb77dc7af919ea4f
@@ -0,0 +1,131 @@
+Return-Path: <markwalters1009@gmail.com>\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 CF530431FD4\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:33 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 9tixTp3LZm1y for <notmuch@notmuchmail.org>;\r
+       Tue, 25 Mar 2014 13:03:29 -0700 (PDT)\r
+Received: from mail-we0-f180.google.com (mail-we0-f180.google.com\r
+       [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 02557431FC2\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:28 -0700 (PDT)\r
+Received: by mail-we0-f180.google.com with SMTP id p61so696471wes.11\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 13:03:27 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=K2IF/+hfJBbwhIAhHdEDx1DdAEOD0dVeR/XD/W1urMQ=;\r
+       b=0FVL9rsiUm34iUQ+NprYytuTriu269wnpmqP0dBCEgosIr7fQ33KfMRTLsVCdvBLwz\r
+       f69Xi/2+cR0Rqr8Szb/t5VdJCHl6UFnGsW7DWCYYMFquMCDUgF1kCFpa1qwTiUSn+3AV\r
+       SpByiFzVxSS8KAfEvuvtBkOhC3ClKmDYTGha4cpv4vI2RrzQ+72BdPvS8KI2OuusGOAQ\r
+       agMuoHUceWCArtiaf3Mxo2PzeD21aOLVba5TkkeNgID++mWU6l3S/d7PHl5OY8wCsYU8\r
+       /i7u6GTTaaiv6QG52mh9ppu1OljcFhkUjJPFj+QUloFled/Z9pSzOxk60JcrrVvbNNYf\r
+       va/Q==\r
+X-Received: by 10.180.165.238 with SMTP id zb14mr25915148wib.51.1395777799348;\r
+       Tue, 25 Mar 2014 13:03:19 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id dd5sm984658wib.12.2014.03.25.13.03.18\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 25 Mar 2014 13:03:18 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 1/3] test: make test_emacs call post-command-hook\r
+Date: Tue, 25 Mar 2014 20:03:11 +0000\r
+Message-Id: <1395777793-13297-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1395777793-13297-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1395777793-13297-1-git-send-email-markwalters1009@gmail.com>\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: Tue, 25 Mar 2014 20:03:34 -0000\r
+\r
+From: David Bremner <david@tethera.net>\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
+ 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 437f83f..36afe63 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -52,11 +52,13 @@ (defun notmuch-test-wait ()\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
+@@ -166,6 +168,15 @@ (defun notmuch-test-expect-equal (output expected)\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
++\r
+ ;; For historical reasons, we hide deleted tags by default in the test\r
+ ;; suite\r
+ (setq notmuch-tag-deleted-formats\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 8697d6a..e6403e5 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1139,7 +1139,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.7.10.4\r
+\r