From 6ba449b5e985a6a8e70429b4ccd6a5c0e51e5ebd Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 21 Nov 2012 10:09:51 +0200 Subject: [PATCH] Re: [PATCH] test: Produce useful output when the HTML with images test fails --- 01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 diff --git a/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 b/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 new file mode 100644 index 000000000..a9cf9b419 --- /dev/null +++ b/01/c8f64aa6782426630bff9a82b572a6f9d7e4c8 @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 52BD5431FB6 + for ; Wed, 21 Nov 2012 00:09:58 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nMKcSX29HrEw for ; + Wed, 21 Nov 2012 00:09:54 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 678AB431FAF + for ; Wed, 21 Nov 2012 00:09:54 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 9E96B10010B; + Wed, 21 Nov 2012 10:09:51 +0200 (EET) +From: Tomi Ollila +To: Austin Clements , "Tom Prince" +Subject: Re: [PATCH] test: Produce useful output when the HTML with images + test fails +In-Reply-To: <1353427125-13854-1-git-send-email-amdragon@mit.edu> +References: <1353427125-13854-1-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 21 Nov 2012 08:09:58 -0000 + +On Tue, Nov 20 2012, Austin Clements wrote: + +> Previously, this would simply indicate that the grep failed without +> any indication of the Emacs output it failed on. Now we take +> advantage of the test framework's handling of stdout to display the +> incorrect Emacs output if the test fails. +> --- +> +> Besides being a good idea in general, this is the first step toward +> fixing this test on the Notmuch buildbot, since right now there's no +> indication of why it's failing. + +Tom: could you do separate test on the buildbot machine (master-emacs24 +config) with this patch applied and then running +NOTMUCH_TESTS=emacs make test + +Tomi + +> test/emacs | 5 +++-- +> 1 file changed, 3 insertions(+), 2 deletions(-) +> +> diff --git a/test/emacs b/test/emacs +> index 77265b0..5649d55 100755 +> --- a/test/emacs +> +++ b/test/emacs +> @@ -809,9 +809,10 @@ test_emacs "(let ((mm-text-html-renderer +> (notmuch-show \"id:${gen_msg_id}\")) +> (test-output)" > /dev/null +> # Different Emacs versions and renderers give very different results, +> -# so just check that something reasonable showed up. +> +# so just check that something reasonable showed up. We first cat the +> +# output so the test framework will print it if the test fails. +> test_expect_success "Rendering HTML mail with images" \ +> - 'grep -q smiley OUTPUT' +> + 'cat OUTPUT && grep -q smiley OUTPUT' +> +> +> test_done +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2