From cd8d66d67f46b5b7b7fbed05fd167b5d908f8ba8 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 23 Jan 2014 17:35:57 +0000 Subject: [PATCH] Re: [PATCH] test: make test_emacs call post-command-hook --- 03/7643ac80c9f3a4b84a9d8a5abf7fdd983dcfd5 | 158 ++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 03/7643ac80c9f3a4b84a9d8a5abf7fdd983dcfd5 diff --git a/03/7643ac80c9f3a4b84a9d8a5abf7fdd983dcfd5 b/03/7643ac80c9f3a4b84a9d8a5abf7fdd983dcfd5 new file mode 100644 index 000000000..3949e9c79 --- /dev/null +++ b/03/7643ac80c9f3a4b84a9d8a5abf7fdd983dcfd5 @@ -0,0 +1,158 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1BF0C431FAF + for ; Thu, 23 Jan 2014 09:38:39 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id oFUTjVhS3L9N for ; + Thu, 23 Jan 2014 09:38:31 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1F972431FB6 + for ; Thu, 23 Jan 2014 09:38:31 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1W6OEO-0002jM-M0; Thu, 23 Jan 2014 17:38:26 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1W6ODT-00022O-FL; Thu, 23 Jan 2014 17:37:24 +0000 +From: Mark Walters +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: [PATCH] test: make test_emacs call post-command-hook +In-Reply-To: <1390354365-12311-1-git-send-email-david@tethera.net> +References: <1387064676-15508-6-git-send-email-markwalters1009@gmail.com> + <1390354365-12311-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Thu, 23 Jan 2014 17:35:57 +0000 +Message-ID: <87d2jizjlu.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 436a299435c458fafe23545f5172f336 (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 23 Jan 2014 17:38:39 -0000 + + +Hi + +On Wed, 22 Jan 2014, David Bremner wrote: +> From: Mark Walters +> +> The unread/read changes will use the post-command-hook. test_emacs +> does not call the post-command-hook. This adds a notmuch-test-progn +> which takes a list of commands as argument and executes them in turn +> but runs the post-command-hook after each one. +> +> The caller can batch operations (ie to stop post-command-hook from +> being interleaved) by wrapping the batch of operations inside a progn. +> +> We also explicitly run the post-command-hook before getting the output +> from a test; this makes sense as this will be a place the user would +> be seeing the information. +> --- +> +> What do you think about this alternate version? it allows +> notmuch-test-progn to have the same syntax as progn. It seems about +> the same level of complexity to me; fwiw I prefer the let over the +> dolist/setq. + +This looks much nicer: a macro is definitely the right way to do this. + +I might be inclined to replace the let... by a prog1 but would be happy +either way on that. + +Best wishes + +Mark + + +> +> test/test-lib.el | 13 +++++++++++++ +> test/test-lib.sh | 2 +- +> 2 files changed, 14 insertions(+), 1 deletion(-) +> +> diff --git a/test/test-lib.el b/test/test-lib.el +> index 37fcb3d..a12ad97 100644 +> --- a/test/test-lib.el +> +++ b/test/test-lib.el +> @@ -52,11 +52,13 @@ +> +> (defun test-output (&optional filename) +> "Save current buffer to file FILENAME. Default FILENAME is OUTPUT." +> + (notmuch-post-command) +> (write-region (point-min) (point-max) (or filename "OUTPUT"))) +> +> (defun test-visible-output (&optional filename) +> "Save visible text in current buffer to file FILENAME. Default +> FILENAME is OUTPUT." +> + (notmuch-post-command) +> (let ((text (visible-buffer-string))) +> (with-temp-file (or filename "OUTPUT") (insert text)))) +> +> @@ -165,3 +167,14 @@ nothing." +> +> (t +> (notmuch-test-report-unexpected output expected))))) +> + +> +(defun notmuch-post-command () +> + (run-hooks 'post-command-hook)) +> + +> +(defmacro notmuch-test-progn (&rest body) +> + (cons 'progn +> + (mapcar +> + (lambda (x) `(let ((ret ,x)) +> + (notmuch-post-command) +> + ret)) +> + body))) +> diff --git a/test/test-lib.sh b/test/test-lib.sh +> index 78af170..27dcb59 100644 +> --- a/test/test-lib.sh +> +++ b/test/test-lib.sh +> @@ -1118,7 +1118,7 @@ test_emacs () { +> rm -f OUTPUT +> touch OUTPUT +> +> - ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)" +> + ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)" +> } +> +> test_python() { +> -- +> 1.8.5.2 -- 2.26.2