Re: [PATCH] test: Produce useful output when the HTML with images test fails

diff --git a/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 b/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8
new file mode 100644 (file)
index 0000000..a9cf9b4
--- /dev/null
+++ b/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8
@@ -0,0 +1,97 @@
+Return-Path: <tomi.ollila@iki.fi>\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 52BD5431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 00:09:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 nMKcSX29HrEw for <notmuch@notmuchmail.org>;\r
+       Wed, 21 Nov 2012 00:09:54 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 678AB431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 00:09:54 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9E96B10010B;\r
+       Wed, 21 Nov 2012 10:09:51 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, "Tom Prince" <tom.prince@ualberta.net>\r
+Subject: Re: [PATCH] test: Produce useful output when the HTML with images\r
+       test fails\r
+In-Reply-To: <1353427125-13854-1-git-send-email-amdragon@mit.edu>\r
+References: <1353427125-13854-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 21 Nov 2012 10:09:51 +0200\r
+Message-ID: <m2haojgywg.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch@notmuchmail.org\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: Wed, 21 Nov 2012 08:09:58 -0000\r
+\r
+On Tue, Nov 20 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Previously, this would simply indicate that the grep failed without\r
+> any indication of the Emacs output it failed on.  Now we take\r
+> advantage of the test framework's handling of stdout to display the\r
+> incorrect Emacs output if the test fails.\r
+> ---\r
+>\r
+> Besides being a good idea in general, this is the first step toward\r
+> fixing this test on the Notmuch buildbot, since right now there's no\r
+> indication of why it's failing.\r
+\r
+Tom: could you do separate test on the buildbot machine (master-emacs24\r
+config) with this patch applied and then running\r
+NOTMUCH_TESTS=emacs make test\r
+\r
+Tomi\r
+\r
+>  test/emacs |    5 +++--\r
+>  1 file changed, 3 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/test/emacs b/test/emacs\r
+> index 77265b0..5649d55 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -809,9 +809,10 @@ test_emacs "(let ((mm-text-html-renderer\r
+>            (notmuch-show \"id:${gen_msg_id}\"))\r
+>          (test-output)" > /dev/null\r
+>  # Different Emacs versions and renderers give very different results,\r
+> -# so just check that something reasonable showed up.\r
+> +# so just check that something reasonable showed up.  We first cat the\r
+> +# output so the test framework will print it if the test fails.\r
+>  test_expect_success "Rendering HTML mail with images" \\r
+> -    'grep -q smiley OUTPUT'\r
+> +    'cat OUTPUT && grep -q smiley OUTPUT'\r
+>  \r
+>  \r
+>  test_done\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r