6a/c19dcac957625df4bc1ca123e4c531719f9437

   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 A278B429E33\r
   6         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:57 -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 kTBiMupSLMm3 for <notmuch@notmuchmail.org>;\r
  16         Fri, 14 Dec 2012 21:15:56 -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 E8343431FC9\r
  20         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:37 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7f886d000000936-8d-50cc0779dc65\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id A3.02.02358.9770CC05; Sat, 15 Dec 2012 00:15:37 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qBF5FReo021592; \r
  27         Sat, 15 Dec 2012 00:15:27 -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 qBF5FOkl011449\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 15 Dec 2012 00:15:26 -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 1Tjk5s-0002kc-DB; Sat, 15 Dec 2012 00:15:24 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 7/7] test: Test search's handling of subprocess errors\r
  41 Date: Sat, 15 Dec 2012 00:15:13 -0500\r
  42 Message-Id: <1355548513-10085-8-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 In-Reply-To: <1355548513-10085-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1355548513-10085-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrFvJfibA4OgdMYvVc3ksrt+cyezA\r
  48         5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZby9f4O54B5HxcKlO1kaGNvYuxg5OCQETCR+\r
  49         XPToYuQEMsUkLtxbz9bFyMUhJLCPUWJz+0QWCGcDo8SRK/1MEM4jJomZFw6zQzhzGSVedb5g\r
  50         BulnE9CQ2LZ/OSOILSIgLbHz7mxWEJtZwFHi8/5FbCC2sICbxM0lbUwgNouAqsTBHfPB6nkF\r
  51         HCTOLjvLBnGHokT3swlgNidQ77KP51hAbCGQmld3WScw8i9gZFjFKJuSW6Wbm5iZU5yarFuc\r
  52         nJiXl1qka6iXm1mil5pSuokRHEiSPDsY3xxUOsQowMGoxMO7I+J0gBBrYllxZe4hRkkOJiVR\r
  53         3lsMZwKE+JLyUyozEosz4otKc1KLDzFKcDArifCKbQEq501JrKxKLcqHSUlzsCiJ815Ouekv\r
  54         JJCeWJKanZpakFoEk5Xh4FCS4P3BBjRUsCg1PbUiLTOnBCHNxMEJMpwHaDhYDW9xQWJucWY6\r
  55         RP4Uo6KUOO9VkIQASCKjNA+uFxbprxjFgV4R5o0GqeIBJgm47ldAg5mABsddOg4yuCQRISXV\r
  56         wOizT1nm+ZUdr+9a6Z9nuZ72+qKc43qpW5bJC1bPL5pUz/z8VeVd0wWFdyXvxEk8YVOr2p7z\r
  57         lv/oo95LmxxlA8y2+3MkFIVZr+wIsmzXE2d4OT35RJ7V9LQFWqzmpx7WpNYpbtC9+ur3Kb9z\r
  58         9dqHXi1tYGqTjjd8qTq323GT5611ZwQl/LK50pVYijMSDbWYi4oTAdHYCG/PAgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Sat, 15 Dec 2012 05:15:58 -0000\r
  72 \r
  73 ---\r
  74  test/emacs |   23 +++++++++++++++++++++++\r
  75  1 file changed, 23 insertions(+)\r
  76 \r
  77 diff --git a/test/emacs b/test/emacs\r
  78 index 5403930..88b062c 100755\r
  79 --- a/test/emacs\r
  80 +++ b/test/emacs\r
  81 @@ -853,4 +853,27 @@ test_expect_success "Rendering HTML mail with images" \\r
  82      'cat OUTPUT && grep -q smiley OUTPUT'\r
  83  \r
  84  \r
  85 +test_begin_subtest "Search handles subprocess errors"\r
  86 +cat > notmuch_fail <<EOF\r
  87 +#!/bin/sh\r
  88 +echo This is output\r
  89 +echo This is an error >&2\r
  90 +exit 1\r
  91 +EOF\r
  92 +chmod a+x notmuch_fail\r
  93 +test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
  94 +              (notmuch-search \"tag:inbox\")\r
  95 +              (notmuch-test-wait)\r
  96 +              (test-output)\r
  97 +              (with-current-buffer \"*Notmuch errors*\"\r
  98 +                 (test-output \"ERROR\")))"\r
  99 +test_expect_equal "$(cat OUTPUT ERROR)" "\\r
 100 +Error: Unexpected output from notmuch search:\r
 101 +This is output\r
 102 +Error: Unexpected output from notmuch search:\r
 103 +This is an error\r
 104 +End of search results.\r
 105 +Error invoking notmuch.  /tmp/nmtest/tmp.emacs/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1."\r
 106 +\r
 107 +\r
 108  test_done\r
 109 -- \r
 110 1.7.10.4\r
 111 \r