d3/3e64c497e7266ebda9436bf8deb34e669ff6a7

   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 3ABFE431FB6\r
   6         for <notmuch@notmuchmail.org>; Tue, 20 Nov 2012 07:58:54 -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 TnSpKkIjWRFh for <notmuch@notmuchmail.org>;\r
  16         Tue, 20 Nov 2012 07:58:53 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
  18         [18.7.68.37])\r
  19         by olra.theworths.org (Postfix) with ESMTP id ADE7C431FAF\r
  20         for <notmuch@notmuchmail.org>; Tue, 20 Nov 2012 07:58:53 -0800 (PST)\r
  21 X-AuditID: 12074425-b7fcc6d00000091f-4b-50aba8bcbc92\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 3D.9E.02335.CB8ABA05; Tue, 20 Nov 2012 10:58:52 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qAKFwpRG006015; \r
  27         Tue, 20 Nov 2012 10:58:51 -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 qAKFwlpD011155\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 20 Nov 2012 10:58:50 -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 1TaqDm-0003eI-Gv; Tue, 20 Nov 2012 10:58:46 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH] test: Produce useful output when the HTML with images test\r
  41         fails\r
  42 Date: Tue, 20 Nov 2012 10:58:45 -0500\r
  43 Message-Id: <1353427125-13854-1-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10.4\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFlrGIsWRmVeSWpSXmKPExsUixG6nrrtnxeoAg+m7xCxutHYzWly/OZPZ\r
  47         gcnj2apbzB5bDr1nDmCK4rJJSc3JLEst0rdL4MqY17yMuWABZ8WNaQ/YGxhXs3cxcnJICJhI\r
  48         bDr4hBnCFpO4cG89WxcjF4eQwD5GiTN3JjBCOBsYJfae/A3lPGKSmPj8CyuEM5dRouHTERaQ\r
  49         fjYBDYlt+5czgtgiAtISO+/OZgWxmQUsJa5+bWcCsYUFAiVevV8OVs8ioCpx8PMqNhCbV8BB\r
  50         YsfT+1B3KEp0P5vANoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdC73czBK91JTSTYzg\r
  51         4HBR3cE44ZDSIUYBDkYlHt4HCasChFgTy4orcw8xSnIwKYnyGi9fHSDEl5SfUpmRWJwRX1Sa\r
  52         k1p8iFGCg1lJhHfHEqAcb0piZVVqUT5MSpqDRUmc90bKTX8hgfTEktTs1NSC1CKYrAwHh5IE\r
  53         bz7IUMGi1PTUirTMnBKENBMHJ8hwHqDhk0FqeIsLEnOLM9Mh8qcYFaXEeetAEgIgiYzSPLhe\r
  54         WPS+YhQHekWYdxpIFQ8w8uG6XwENZgIaHO8CNrgkESEl1cC4TcxN+GjttWM5k+epPBZh2bvj\r
  55         Qu2cBemnciM6OjRbjr3kObYrXO7BnFkyuUt0f67jSy69y1Z3Z9O72/4nckMZbRkTvUTvuz4s\r
  56         +VCmYBLwUvN4i6/hIhHrmA3SIfeFedU8pXYZTv26P/vZmulTO3bOqXjVsWZh9ifnhR8/Hd50\r
  57         oajc9tvymc7eSizFGYmGWsxFxYkAiBSylLkCAAA=\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Tue, 20 Nov 2012 15:58:54 -0000\r
  71 \r
  72 Previously, this would simply indicate that the grep failed without\r
  73 any indication of the Emacs output it failed on.  Now we take\r
  74 advantage of the test framework's handling of stdout to display the\r
  75 incorrect Emacs output if the test fails.\r
  76 ---\r
  77 \r
  78 Besides being a good idea in general, this is the first step toward\r
  79 fixing this test on the Notmuch buildbot, since right now there's no\r
  80 indication of why it's failing.\r
  81 \r
  82  test/emacs |    5 +++--\r
  83  1 file changed, 3 insertions(+), 2 deletions(-)\r
  84 \r
  85 diff --git a/test/emacs b/test/emacs\r
  86 index 77265b0..5649d55 100755\r
  87 --- a/test/emacs\r
  88 +++ b/test/emacs\r
  89 @@ -809,9 +809,10 @@ test_emacs "(let ((mm-text-html-renderer\r
  90               (notmuch-show \"id:${gen_msg_id}\"))\r
  91             (test-output)" > /dev/null\r
  92  # Different Emacs versions and renderers give very different results,\r
  93 -# so just check that something reasonable showed up.\r
  94 +# so just check that something reasonable showed up.  We first cat the\r
  95 +# output so the test framework will print it if the test fails.\r
  96  test_expect_success "Rendering HTML mail with images" \\r
  97 -    'grep -q smiley OUTPUT'\r
  98 +    'cat OUTPUT && grep -q smiley OUTPUT'\r
  99  \r
 100  \r
 101  test_done\r
 102 -- \r
 103 1.7.10.4\r
 104 \r