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

diff --git a/d4/9d15d65c95bdf848aa7401900c4941aad7229b b/d4/9d15d65c95bdf848aa7401900c4941aad7229b
new file mode 100644 (file)
index 0000000..52d992d
--- /dev/null
+++ b/d4/9d15d65c95bdf848aa7401900c4941aad7229b
@@ -0,0 +1,126 @@
+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 79B2B431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 00:25:39 -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 T-IG+qriIA1O for <notmuch@notmuchmail.org>;\r
+       Wed, 21 Nov 2012 00:25:38 -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 E0C62431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Nov 2012 00:25:37 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id BF32210010B;\r
+       Wed, 21 Nov 2012 10:25:36 +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: <m2haojgywg.fsf@guru.guru-group.fi>\r
+References: <1353427125-13854-1-git-send-email-amdragon@mit.edu>\r
+       <m2haojgywg.fsf@guru.guru-group.fi>\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:25:36 +0200\r
+Message-ID: <m28v9vjrb3.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:25:39 -0000\r
+\r
+On Wed, Nov 21 2012, Tomi Ollila <tomi.ollila@iki.fi> wrote:\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
+Hmm, I just remembered something:\r
+\r
+>From notmuch IRC log Thu Oct 25 2012\r
+\r
+--8<----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<--\r
+< Domo_> For me the 'shr test fails by missing libxml-parse-html-region ...\r
+< Domo_> which is defined in src/xml.c -- and exists by default on \r
+         another emacs...\r
+< Domo_> which probably means that my self-compiled emacs24 just doesn't \r
+         have that xml code compiled in :(\r
+< Domo_> #ifdef HAVE_LIBXML2\r
+< Domo_> ...\r
+< Domo_> #endif /* HAVE_LIBXML2 */\r
+--8<----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<--\r
+\r
+So, this is something to be checked for -- installing \r
+libxml2-devel-2.7.6-8.el6_3.3.x86_64 (on Scientific Linux 6 machine)\r
+and rebuilding emacs made things work for me.\r
+\r
+I'd guess the recipe to build emacs 24 on gentoo had this dependency\r
+but maybe emacs24 is so new that at the time buildbot machine got\r
+emacs24 that wasn't there yet ???\r
+\r
+Tomi\r
+\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