33/080f1101298f82b988d41519dc6f51434d92c7

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 107AD431FC3\r
   6         for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:35 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id aIevK8-ERkxs for <notmuch@notmuchmail.org>;\r
  16         Sat, 15 Dec 2012 12:04:34 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 55C44431FBF\r
  20         for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:34 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7f886d000000936-be-50ccd7d1925e\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 4D.DD.02358.1D7DCC05; Sat, 15 Dec 2012 15:04:33 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBFK4WvH014732; \r
  27         Sat, 15 Dec 2012 15:04:32 -0500\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBFK4T1X025687\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 15 Dec 2012 15:04:31 -0500 (EST)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1TjxyG-0007sh-RV; Sat, 15 Dec 2012 15:04:28 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 7/7] test: Test search's handling of subprocess errors\r
  41 Date: Sat, 15 Dec 2012 15:04:20 -0500\r
  42 Message-Id: <1355601860-30121-8-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 In-Reply-To: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixG6nonvx+pkAg1ftshar5/JYXL85k9ni\r
  48         zcp5rA7MHjtn3WX3OPx1IYvHs1W3mAOYo7hsUlJzMstSi/TtErgyPi74w1xwlqPi9J2Z7A2M\r
  49         X9m6GDk5JARMJE60XWKCsMUkLtxbDxTn4hAS2McosW7qU0YIZwOjxJoPF6Eyj5gk5rxbywTh\r
  50         zGWUaH18hRGkn01AQ2Lb/uVgtoiAtMTOu7NZQWxmgTiJLVP+A8U5OIQFPCVmd4CtZhFQleic\r
  51         95EFJMwr4CDxaE82xBWKEt3PJoCVcAo4SkycvAvsOiGgktsL5jBNYORfwMiwilE2JbdKNzcx\r
  52         M6c4NVm3ODkxLy+1SNdQLzezRC81pXQTIyi0OCV5djC+Oah0iFGAg1GJh3dHxOkAIdbEsuLK\r
  53         3EOMkhxMSqK8GZfPBAjxJeWnVGYkFmfEF5XmpBYfYpTgYFYS4U2aD5TjTUmsrEotyodJSXOw\r
  54         KInzXk656S8kkJ5YkpqdmlqQWgSTleHgUJLgFQLGkJBgUWp6akVaZk4JQpqJgxNkOA/QcA6Q\r
  55         Gt7igsTc4sx0iPwpRkUpcV4GkIQASCKjNA+uFxb7rxjFgV4R5v1wDaiKB5g24LpfAQ1mAhq8\r
  56         3AZscEkiQkqqgbFn2xunY8sblJeEzrs4ZeYpz80+c76ytD+7s2eh04k8vsxbWy+4ftvP4Z6z\r
  57         XLpK9+fi2/a5Iqrvnu5+yahx6r+/b9Cd62Lrd3NM89Q/MV9+qtJLJx8d3yNyV19/6K954tX/\r
  58         N2//mX2v2zrnnfrvvpNTqU9ka6zvls3q++4+vXz3T1/sN/6yB7zrlFiKMxINtZiLihMB9coc\r
  59         7tgCAAA=\r
  60 Cc: tomi.ollila@iki.fi\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sat, 15 Dec 2012 20:04:35 -0000\r
  74 \r
  75 ---\r
  76  test/emacs |   23 +++++++++++++++++++++++\r
  77  1 file changed, 23 insertions(+)\r
  78 \r
  79 diff --git a/test/emacs b/test/emacs\r
  80 index 5403930..5067d67 100755\r
  81 --- a/test/emacs\r
  82 +++ b/test/emacs\r
  83 @@ -853,4 +853,27 @@ test_expect_success "Rendering HTML mail with images" \\r
  84      'cat OUTPUT && grep -q smiley OUTPUT'\r
  85  \r
  86  \r
  87 +test_begin_subtest "Search handles subprocess errors"\r
  88 +cat > notmuch_fail <<EOF\r
  89 +#!/bin/sh\r
  90 +echo This is output\r
  91 +echo This is an error >&2\r
  92 +exit 1\r
  93 +EOF\r
  94 +chmod a+x notmuch_fail\r
  95 +test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
  96 +              (notmuch-search \"tag:inbox\")\r
  97 +              (notmuch-test-wait)\r
  98 +              (test-output)\r
  99 +              (with-current-buffer \"*Notmuch errors*\"\r
 100 +                 (test-output \"ERROR\")))"\r
 101 +test_expect_equal "$(cat OUTPUT ERROR)" "\\r
 102 +Error: Unexpected output from notmuch search:\r
 103 +This is output\r
 104 +Error: Unexpected output from notmuch search:\r
 105 +This is an error\r
 106 +End of search results.\r
 107 +Error invoking notmuch.  $PWD/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1."\r
 108 +\r
 109 +\r
 110  test_done\r
 111 -- \r
 112 1.7.10.4\r
 113 \r