a6/06f10f019b78f30f9f8e0cacf455acaa1527a9

   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 970C8431FB6\r
   6         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:29 -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 hm3L9xhDKWmt for <notmuch@notmuchmail.org>;\r
  16         Fri, 14 Dec 2012 21:15:29 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 618AA431FC0\r
  20         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:28 -0800 (PST)\r
  21 X-AuditID: 1209190f-b7fec6d00000090d-3a-50cc076f4ea9\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id FF.7B.02317.F670CC05; Sat, 15 Dec 2012 00:15:27 -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 qBF5FQ4c021591; \r
  27         Sat, 15 Dec 2012 00:15:26 -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 qBF5FOqc011447\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-0002kW-AE; 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 5/7] test: Test show's handling of subprocess errors\r
  41 Date: Sat, 15 Dec 2012 00:15:11 -0500\r
  42 Message-Id: <1355548513-10085-6-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+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrJvPfibAYOt3MYvVc3ksrt+cyezA\r
  48         5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZdx7/5Ct4AZ7xd95xQ2Ms9i6GDk5JARMJHae\r
  49         XMMCYYtJXLi3HijOxSEksI9RYu3rR8wQzgZGiTMfFrJAOI+YJKZu3w7lzGWU2HSqnRmkn01A\r
  50         Q2Lb/uWMILaIgLTEzruzWUFsZgFHic/7F4HtExZwkbjw7R+YzSKgKvF6+x2wel4BB4nNa75C\r
  51         3aEo0f1sAlgNJ1Dvso/nwOJCQDVnX91lncDIv4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGu\r
  52         iV5uZoleakrpJkZwIEny72D8dlDpEKMAB6MSD++OiNMBQqyJZcWVuYcYJTmYlER5bzGcCRDi\r
  53         S8pPqcxILM6ILyrNSS0+xCjBwawkwiu2BaicNyWxsiq1KB8mJc3BoiTOezXlpr+QQHpiSWp2\r
  54         ampBahFMVoaDQ0mCl50NaKhgUWp6akVaZk4JQpqJgxNkOA/QcC6QGt7igsTc4sx0iPwpRkUp\r
  55         cd4nrEAJAZBERmkeXC8s0l8xigO9IswrD9LOA0wScN2vgAYzAQ2Ou3QcZHBJIkJKqoExc1Xa\r
  56         RdOd0rYPkzMOpMtvfeuzQFp7hbRi0UP/T7ZOx/m/26XlP19xb7l1v3/AGsa7SbfeLlM6cIZd\r
  57         7061tM5ukTdzXms8tIp8y6J6+FRJ8ReLEiaDhXJvxfvabkSXLb/99OzTGmN1/l6j8gC/2j3z\r
  58         NnNvuLH6/Yuksj5XZTOGM0Z6B5kqFvUrsRRnJBpqMRcVJwIADFVgiM8CAAA=\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:29 -0000\r
  72 \r
  73 ---\r
  74  test/emacs-show |   22 ++++++++++++++++++++++\r
  75  1 file changed, 22 insertions(+)\r
  76 \r
  77 diff --git a/test/emacs-show b/test/emacs-show\r
  78 index b670abf..c67c6a4 100755\r
  79 --- a/test/emacs-show\r
  80 +++ b/test/emacs-show\r
  81 @@ -163,4 +163,26 @@ EOF\r
  82  test_expect_equal_file OUTPUT EXPECTED\r
  83  \r
  84  \r
  85 +test_begin_subtest "Show 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 +              (ignore-errors (notmuch-show \"*\"))\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 invoking notmuch.  /tmp/nmtest/tmp.emacs-show/notmuch_fail show --format=json --exclude=false ' * ' exited with status 1.\r
 101 +Error:\r
 102 +This is an error\r
 103 +Output:\r
 104 +This is output"\r
 105 +\r
 106 +\r
 107  test_done\r
 108 -- \r
 109 1.7.10.4\r
 110 \r