--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 1BF0C431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 09:38:39 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 oFUTjVhS3L9N for <notmuch@notmuchmail.org>;\r
+ Thu, 23 Jan 2014 09:38:31 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 1F972431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 09:38:31 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1W6OEO-0002jM-M0; Thu, 23 Jan 2014 17:38:26 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1W6ODT-00022O-FL; Thu, 23 Jan 2014 17:37:24 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: make test_emacs call post-command-hook\r
+In-Reply-To: <1390354365-12311-1-git-send-email-david@tethera.net>\r
+References: <1387064676-15508-6-git-send-email-markwalters1009@gmail.com>\r
+ <1390354365-12311-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Thu, 23 Jan 2014 17:35:57 +0000\r
+Message-ID: <87d2jizjlu.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 436a299435c458fafe23545f5172f336 (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Thu, 23 Jan 2014 17:38:39 -0000\r
+\r
+\r
+Hi\r
+\r
+On Wed, 22 Jan 2014, David Bremner <david@tethera.net> wrote:\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
+> What do you think about this alternate version? it allows\r
+> notmuch-test-progn to have the same syntax as progn. It seems about\r
+> the same level of complexity to me; fwiw I prefer the let over the\r
+> dolist/setq.\r
+\r
+This looks much nicer: a macro is definitely the right way to do this. \r
+\r
+I might be inclined to replace the let... by a prog1 but would be happy\r
+either way on that.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+>\r
+> test/test-lib.el | 13 +++++++++++++\r
+> test/test-lib.sh | 2 +-\r
+> 2 files changed, 14 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/test/test-lib.el b/test/test-lib.el\r
+> index 37fcb3d..a12ad97 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,14 @@ 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) `(let ((ret ,x))\r
+> + (notmuch-post-command)\r
+> + ret))\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
projects / notmuch-archives.git / commitdiff