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

diff --git a/d9/34791909402f6fa74d3acab846bf990c1506f2 b/d9/34791909402f6fa74d3acab846bf990c1506f2
new file mode 100644 (file)
index 0000000..2d51c60
--- /dev/null
+++ b/d9/34791909402f6fa74d3acab846bf990c1506f2
@@ -0,0 +1,127 @@
+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 38955431FD8\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:45:08 -0800 (PST)\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 Yya3LrJQrG+s for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Dec 2013 15:45:03 -0800 (PST)\r
+Received: from mail-we0-f175.google.com (mail-we0-f175.google.com\r
+       [74.125.82.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 419B2431FDA\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:44:56 -0800 (PST)\r
+Received: by mail-we0-f175.google.com with SMTP id t60so3220031wes.20\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:44:55 -0800 (PST)\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=+efGbVtifOD5XXoCSmyTsITT1MQwKHo3bAWLFVvq/tM=;\r
+       b=VGFoHppb2PupiO9PHS8abdFum/Jxn5E1XqJHuFaDmlnYltqdYpK/xdUinlUenVJ4HI\r
+       eZKr0l+YXRivrhLtzWt9eR51iI+wdwDiWEE2PqxZx+S7q1QyDs+VrThMdbXj8infKhsb\r
+       A+9hsSKf6WfI4wNpcWCVUqgENyWQXdrsJ2u62UCNc0EJJvi13P+wRFQ9lcTqo1j1AHYE\r
+       IicvKV7cKa+u4zcYofO5LVZ06/FOnCmqJKKnCXxjzjVTn9DnVbh1SGHaUfKwfaGmU6rh\r
+       eTccGEHCaOvT9uo8ojeNSYqq0nmZTCyiXDCeiS5jGcNhM+U/UyRJyY3rVeIi8rRp+NZA\r
+       h8lQ==\r
+X-Received: by 10.180.188.100 with SMTP id fz4mr7977704wic.57.1387064695191;\r
+       Sat, 14 Dec 2013 15:44:55 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id w20sm11109685wia.5.2013.12.14.15.44.54\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 14 Dec 2013 15:44:54 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/5] test: make test_emacs call post-command-hook\r
+Date: Sat, 14 Dec 2013 23:44:36 +0000\r
+Message-Id: <1387064676-15508-6-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1387064676-15508-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1387064676-15508-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: Sat, 14 Dec 2013 23:45:08 -0000\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 |   12 ++++++++++++\r
+ test/test-lib.sh |    2 +-\r
+ 2 files changed, 13 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index d26b49f..1c9e224 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
+@@ -162,3 +164,13 @@ 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
++(defun notmuch-test-progn (body)\r
++  (let (form\r
++      ret)\r
++    (dolist (form body ret)\r
++      (setq ret (eval form))\r
++      (notmuch-post-command))))\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d8e0d91..e7833fc 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1075,7 +1075,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.9.1\r
+\r