--- /dev/null
+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 1BC7D431FCB\r
+ for <notmuch@notmuchmail.org>; Thu, 8 May 2014 17:20:26 -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 lQykC0YdfTig for <notmuch@notmuchmail.org>;\r
+ Thu, 8 May 2014 17:20:22 -0700 (PDT)\r
+Received: from mail-we0-f173.google.com (mail-we0-f173.google.com\r
+ [74.125.82.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 4201F431FBF\r
+ for <notmuch@notmuchmail.org>; Thu, 8 May 2014 17:20:22 -0700 (PDT)\r
+Received: by mail-we0-f173.google.com with SMTP id u57so3224423wes.18\r
+ for <notmuch@notmuchmail.org>; Thu, 08 May 2014 17:20:21 -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=JP6GgOiAxOcDkKS8I+MwRxi7ZQ9kKUacUqdCHorjvrVOV7ITf3LCYwY2MaKuog9zL6\r
+ Oleun60MHRoSQoie4odHHwWnUouGWbTf1e6l8k6XvGazkYbTanYx1w5qNZLF2DYgAA4J\r
+ ExD7Fyv5LZWn0jDg6+OoM3S/YsiXseaxYnjaAlhMCaDqFgndowAXfX1IigJWbNOQnqbu\r
+ k8sOIBdHL202G94k0cTRYrXbUSxH0QJlhn6Pv/BnfRSv3IsG8ZO5H7vJcJZwLMduHUfe\r
+ ognFOglKzAwUKPT0HeEMXkGsvQTycidKJDay+qpVyccF8N10z0cWq0OVT/gKlfXHhEgp\r
+ sgOA==\r
+X-Received: by 10.194.91.175 with SMTP id cf15mr5628813wjb.5.1399594821162;\r
+ Thu, 08 May 2014 17:20:21 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id h19sm2023334wiw.17.2014.05.08.17.20.20\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Thu, 08 May 2014 17:20:20 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 1/2] test: make test_emacs call post-command-hook\r
+Date: Fri, 9 May 2014 01:20:07 +0100\r
+Message-Id: <1399594808-2815-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1399594808-2815-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1399594808-2815-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: Fri, 09 May 2014 00:20:26 -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
projects / notmuch-archives.git / commitdiff