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

diff --git a/2d/9d88093d4a2ab8958781f861bab0481bddda25 b/2d/9d88093d4a2ab8958781f861bab0481bddda25
new file mode 100644 (file)
index 0000000..14efc86
--- /dev/null
+++ b/2d/9d88093d4a2ab8958781f861bab0481bddda25
@@ -0,0 +1,132 @@
+Return-Path: <tomi.ollila@iki.fi>\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 40346431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 10:35:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 9AxkDLvvpsJj for <notmuch@notmuchmail.org>;\r
+       Fri, 24 Jan 2014 10:34:53 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A99A8431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 10:34:53 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 346C81000B3;\r
+       Fri, 24 Jan 2014 20:34:46 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\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: <1390578744-30516-1-git-send-email-david@tethera.net>\r
+References: <m2lhy5whok.fsf@guru.guru-group.fi>\r
+       <1390578744-30516-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.17+41~g8e7fabf (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 24 Jan 2014 20:34:46 +0200\r
+Message-ID: <m21tzxns8p.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 24 Jan 2014 18:35:02 -0000\r
+\r
+On Fri, Jan 24 2014, David Bremner <david@tethera.net> wrote:\r
+\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
+> OK, OK, so the previous version re-invented prog1. That's the scheme\r
+> way ;).\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\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 37fcb3d..0ee8371 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,12 @@ 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) `(prog1 ,x (notmuch-post-command)))\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
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r