From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 66B7C6DE1903 for ; Fri, 14 Jul 2017 06:09:20 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.000] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1JSSApOKVkgW for ; Fri, 14 Jul 2017 06:09:19 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTP id BE9F96DE17B1 for ; Fri, 14 Jul 2017 06:09:18 -0700 (PDT) Received: from fifthhorseman.net (38.200.broadband6.iol.cz [88.101.200.38]) by che.mayfirst.org (Postfix) with ESMTPSA id 1A91BF999 for ; Fri, 14 Jul 2017 09:09:17 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 0E24E203E3; Fri, 14 Jul 2017 15:09:12 +0200 (CEST) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 1/2] Ensure that "notmuch reply" succeeds during testing. Date: Fri, 14 Jul 2017 15:09:11 +0200 Message-Id: <20170714130912.24777-1-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Fri, 14 Jul 2017 13:09:20 -0000 In some (bad!) cases, "notmuch reply" might fail, or might even segfault. If this happens, it indicates a bug, and the test suite should notice it. --- test/T220-reply.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/T220-reply.sh b/test/T220-reply.sh index 17741e0d..b12109bf 100755 --- a/test/T220-reply.sh +++ b/test/T220-reply.sh @@ -9,7 +9,7 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="basic reply test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -26,7 +26,7 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="Multiple recipients"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender , Someone Else @@ -44,7 +44,7 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply with CC"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -62,7 +62,7 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply from alternate address"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -80,7 +80,7 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="Reply from address in named group list"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender , someone@example.com @@ -98,7 +98,7 @@ add_message '[from]="Sender "' \ '[body]="support for reply-to"' \ '[reply-to]="Sender "' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -116,7 +116,7 @@ add_message '[from]="Sender "' \ '[body]="Un-munging Reply-To"' \ '[reply-to]="Evil Munging List "' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender , Some List @@ -130,7 +130,7 @@ test_begin_subtest "Message with header of exactly 200 bytes" add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="200-byte header"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes @@ -149,7 +149,7 @@ add_message '[from]="Sender "' \ '[body]="From guessing"' \ '[header]="Envelope-To: test_suite_other@notmuchmail.org"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: From guessing To: Sender , Recipient @@ -167,7 +167,7 @@ add_message '[from]="Sender "' \ '[body]="From guessing"' \ '[header]="X-Original-To: test_suite@otherdomain.org"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: From guessing To: Sender , Recipient @@ -185,7 +185,7 @@ add_message '[from]="Sender "' \ '[body]="From guessing"' \ '[header]="Delivered-To: test_suite_other@notmuchmail.org"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: From guessing To: Sender , Recipient @@ -204,7 +204,7 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \ # GMime happens to change from Q- to B-encoding. We canonicalize the # case of the encoding and charset because different versions of GMime # capitalize the encoding differently. -output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge') +output=$( (notmuch reply id:${gen_msg_id} || echo failed) | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge') test_expect_equal "$output" "\ From: Notmuch Test Suite Subject: Re: =?iso-8859-1?b?4N/n?= @@ -216,7 +216,7 @@ On Tue, 05 Jan 2010 15:43:56 -0000, ☃ wrote: > Encoding" test_begin_subtest "Reply with RFC 2047-encoded headers (JSON)" -output=$(notmuch reply --format=json id:${gen_msg_id}) +output=$(notmuch reply --format=json id:${gen_msg_id} || echo failed) test_expect_equal_json "$output" ' { "original": { @@ -255,7 +255,7 @@ test_expect_equal_json "$output" ' test_begin_subtest "Reply to a message with multiple Cc headers" add_email_corpus broken -output=$(notmuch reply id:multiple-cc@example.org) +output=$(notmuch reply id:multiple-cc@example.org || echo failed) test_expect_equal "$output" "From: Notmuch Test Suite Subject: Re: wowsers! To: Alice , Daniel -- 2.13.2