From: Austin Clements Date: Tue, 20 Nov 2012 15:58:45 +0000 (+1900) Subject: [PATCH] test: Produce useful output when the HTML with images test fails X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=69474b15dd71981db8b4d98ed546ddfaa2d39243;p=notmuch-archives.git [PATCH] test: Produce useful output when the HTML with images test fails --- diff --git a/d3/3e64c497e7266ebda9436bf8deb34e669ff6a7 b/d3/3e64c497e7266ebda9436bf8deb34e669ff6a7 new file mode 100644 index 000000000..3b39e653f --- /dev/null +++ b/d3/3e64c497e7266ebda9436bf8deb34e669ff6a7 @@ -0,0 +1,104 @@ +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 3ABFE431FB6 + for ; Tue, 20 Nov 2012 07:58:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 TnSpKkIjWRFh for ; + Tue, 20 Nov 2012 07:58:53 -0800 (PST) +Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id ADE7C431FAF + for ; Tue, 20 Nov 2012 07:58:53 -0800 (PST) +X-AuditID: 12074425-b7fcc6d00000091f-4b-50aba8bcbc92 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 3D.9E.02335.CB8ABA05; Tue, 20 Nov 2012 10:58:52 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qAKFwpRG006015; + Tue, 20 Nov 2012 10:58:51 -0500 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAKFwlpD011155 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 20 Nov 2012 10:58:50 -0500 (EST) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1TaqDm-0003eI-Gv; Tue, 20 Nov 2012 10:58:46 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH] test: Produce useful output when the HTML with images test + fails +Date: Tue, 20 Nov 2012 10:58:45 -0500 +Message-Id: <1353427125-13854-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10.4 +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrGIsWRmVeSWpSXmKPExsUixG6nrrtnxeoAg+m7xCxutHYzWly/OZPZ + gcnj2apbzB5bDr1nDmCK4rJJSc3JLEst0rdL4MqY17yMuWABZ8WNaQ/YGxhXs3cxcnJICJhI + bDr4hBnCFpO4cG89WxcjF4eQwD5GiTN3JjBCOBsYJfae/A3lPGKSmPj8CyuEM5dRouHTERaQ + fjYBDYlt+5czgtgiAtISO+/OZgWxmQUsJa5+bWcCsYUFAiVevV8OVs8ioCpx8PMqNhCbV8BB + YsfT+1B3KEp0P5vANoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdC73czBK91JTSTYzg + 4HBR3cE44ZDSIUYBDkYlHt4HCasChFgTy4orcw8xSnIwKYnyGi9fHSDEl5SfUpmRWJwRX1Sa + k1p8iFGCg1lJhHfHEqAcb0piZVVqUT5MSpqDRUmc90bKTX8hgfTEktTs1NSC1CKYrAwHh5IE + bz7IUMGi1PTUirTMnBKENBMHJ8hwHqDhk0FqeIsLEnOLM9Mh8qcYFaXEeetAEgIgiYzSPLhe + WPS+YhQHekWYdxpIFQ8w8uG6XwENZgIaHO8CNrgkESEl1cC4TcxN+GjttWM5k+epPBZh2bvj + Qu2cBemnciM6OjRbjr3kObYrXO7BnFkyuUt0f67jSy69y1Z3Z9O72/4nckMZbRkTvUTvuz4s + +VCmYBLwUvN4i6/hIhHrmA3SIfeFedU8pXYZTv26P/vZmulTO3bOqXjVsWZh9ifnhR8/Hd50 + oajc9tvymc7eSizFGYmGWsxFxYkAiBSylLkCAAA= +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: Tue, 20 Nov 2012 15:58:54 -0000 + +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. + + 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 +