--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 107AD431FC3\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:35 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 aIevK8-ERkxs for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 12:04:34 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+ [18.9.25.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id 55C44431FBF\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:34 -0800 (PST)\r
+X-AuditID: 1209190c-b7f886d000000936-be-50ccd7d1925e\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 4D.DD.02358.1D7DCC05; Sat, 15 Dec 2012 15:04:33 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBFK4WvH014732; \r
+ Sat, 15 Dec 2012 15:04:32 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBFK4T1X025687\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 15 Dec 2012 15:04:31 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TjxyG-0007sh-RV; Sat, 15 Dec 2012 15:04:28 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 7/7] test: Test search's handling of subprocess errors\r
+Date: Sat, 15 Dec 2012 15:04:20 -0500\r
+Message-Id: <1355601860-30121-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+References: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixG6nonvx+pkAg1ftshar5/JYXL85k9ni\r
+ zcp5rA7MHjtn3WX3OPx1IYvHs1W3mAOYo7hsUlJzMstSi/TtErgyPi74w1xwlqPi9J2Z7A2M\r
+ X9m6GDk5JARMJE60XWKCsMUkLtxbDxTn4hAS2McosW7qU0YIZwOjxJoPF6Eyj5gk5rxbywTh\r
+ zGWUaH18hRGkn01AQ2Lb/uVgtoiAtMTOu7NZQWxmgTiJLVP+A8U5OIQFPCVmd4CtZhFQleic\r
+ 95EFJMwr4CDxaE82xBWKEt3PJoCVcAo4SkycvAvsOiGgktsL5jBNYORfwMiwilE2JbdKNzcx\r
+ M6c4NVm3ODkxLy+1SNdQLzezRC81pXQTIyi0OCV5djC+Oah0iFGAg1GJh3dHxOkAIdbEsuLK\r
+ 3EOMkhxMSqK8GZfPBAjxJeWnVGYkFmfEF5XmpBYfYpTgYFYS4U2aD5TjTUmsrEotyodJSXOw\r
+ KInzXk656S8kkJ5YkpqdmlqQWgSTleHgUJLgFQLGkJBgUWp6akVaZk4JQpqJgxNkOA/QcA6Q\r
+ Gt7igsTc4sx0iPwpRkUpcV4GkIQASCKjNA+uFxb7rxjFgV4R5v1wDaiKB5g24LpfAQ1mAhq8\r
+ 3AZscEkiQkqqgbFn2xunY8sblJeEzrs4ZeYpz80+c76ytD+7s2eh04k8vsxbWy+4ftvP4Z6z\r
+ XLpK9+fi2/a5Iqrvnu5+yahx6r+/b9Cd62Lrd3NM89Q/MV9+qtJLJx8d3yNyV19/6K954tX/\r
+ N2//mX2v2zrnnfrvvpNTqU9ka6zvls3q++4+vXz3T1/sN/6yB7zrlFiKMxINtZiLihMB9coc\r
+ 7tgCAAA=\r
+Cc: tomi.ollila@iki.fi\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 20:04:35 -0000\r
+\r
+---\r
+ test/emacs | 23 +++++++++++++++++++++++\r
+ 1 file changed, 23 insertions(+)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 5403930..5067d67 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. $PWD/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1."\r
++\r
++\r
+ test_done\r
+-- \r
+1.7.10.4\r
+\r