Re: [PATCH 7/7] test: Test search's handling of subprocess errors

diff --git a/41/b3a9ce1592969b3aaa29954f36885625885cde b/41/b3a9ce1592969b3aaa29954f36885625885cde
new file mode 100644 (file)
index 0000000..5507d81
--- /dev/null
+++ b/41/b3a9ce1592969b3aaa29954f36885625885cde
@@ -0,0 +1,123 @@
+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 AD227431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 01:48:26 -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 iqc-w521NQJG for <notmuch@notmuchmail.org>;\r
+       Sat, 15 Dec 2012 01:48:26 -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 F028F431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 01:48:25 -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 1TjoM4-0002VC-AV; Sat, 15 Dec 2012 09:48:24 +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.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TjoM3-0006pk-V5; Sat, 15 Dec 2012 09:48:24 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 7/7] test: Test search's handling of subprocess errors\r
+In-Reply-To: <1355548513-10085-8-git-send-email-amdragon@mit.edu>\r
+References: <1355548513-10085-1-git-send-email-amdragon@mit.edu>\r
+       <1355548513-10085-8-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 15 Dec 2012 09:48:24 +0000\r
+Message-ID: <87zk1ffxxz.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-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: cf2ff3170caefe69f53b2f32cd74b9a2 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\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 -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 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: Sat, 15 Dec 2012 09:48:26 -0000\r
+\r
+On Sat, 15 Dec 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> ---\r
+>  test/emacs |   23 +++++++++++++++++++++++\r
+>  1 file changed, 23 insertions(+)\r
+>\r
+> diff --git a/test/emacs b/test/emacs\r
+> index 5403930..88b062c 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -853,4 +853,27 @@ test_expect_success "Rendering HTML mail with images" \\r
+>      'cat OUTPUT && grep -q smiley OUTPUT'\r
+>  \r
+>  \r
+> +test_begin_subtest "Search handles subprocess errors"\r
+> +cat > notmuch_fail <<EOF\r
+> +#!/bin/sh\r
+> +echo This is output\r
+> +echo This is an error >&2\r
+> +exit 1\r
+> +EOF\r
+> +chmod a+x notmuch_fail\r
+> +test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
+> +           (notmuch-search \"tag:inbox\")\r
+> +           (notmuch-test-wait)\r
+> +           (test-output)\r
+> +           (with-current-buffer \"*Notmuch errors*\"\r
+> +              (test-output \"ERROR\")))"\r
+> +test_expect_equal "$(cat OUTPUT ERROR)" "\\r
+> +Error: Unexpected output from notmuch search:\r
+> +This is output\r
+> +Error: Unexpected output from notmuch search:\r
+> +This is an error\r
+> +End of search results.\r
+> +Error invoking notmuch.  /tmp/nmtest/tmp.emacs/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1."\r
+\r
+The filename above is hardcoded so fails for me, and the same for patch\r
+5/7 (modulo this the tests would both pass)\r
+\r
+Best wishes \r
+\r
+Mark\r
+\r
+\r
+ \r
+\r
+> +\r
+> +\r
+>  test_done\r
+> -- \r
+> 1.7.10.4\r