--- /dev/null
+Return-Path: <awg@lagos.xvx.ca>\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 01920421191\r
+ for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 17:33:31 -0700 (PDT)\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\r
+ tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 40f5iqL-btYA for <notmuch@notmuchmail.org>;\r
+ Sat, 31 Mar 2012 17:33:29 -0700 (PDT)\r
+Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9])\r
+ by olra.theworths.org (Postfix) with ESMTP id B3142429E54\r
+ for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 17:33:28 -0700 (PDT)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd7ml2no-ssvc.prod.shaw.ca)\r
+ ([10.0.144.222])\r
+ by pd6mo1no-svcs.prod.shaw.ca with ESMTP; 31 Mar 2012 18:33:27 -0600\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=GZn8e3lTBEeJrlGK3+GUWyR5aYe1SJcDn5uEERMe9yQ=\r
+ c=1 sm=1\r
+ a=_h02RqDfyKsA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+ a=7343-z1_AAAA:8 a=A1X0JdhQAAAA:8 a=V2sgnzSHAAAA:8 a=pGLkceISAAAA:8\r
+ a=Ps0CLmBwa3s86Ge5-1UA:9 a=vH5s_6-iUSyMLwNrW-IA:7 a=0BPXsuqt4rsA:10\r
+ a=0c-eHkXYtrgA:10 a=Y6qChIQXU1wA:10 a=Gb7Eya4fYr0A:10 a=MSl-tDqOz04A:10\r
+ a=5WXwG0oxU3rw_xjX:21 a=yJUVya31QC1t70qB:21\r
+ a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+ by pd7ml2no-dmz.prod.shaw.ca with ESMTP; 31 Mar 2012 18:33:27 -0600\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+ id 2AE34800422D; Sat, 31 Mar 2012 18:33:27 -0600 (MDT)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [BUG/PATCH v3 3/4] test: Show all headers in emacs reply tests\r
+Date: Sat, 31 Mar 2012 18:33:23 -0600\r
+Message-Id: <1333240404-13076-4-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1333240404-13076-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1333240404-13076-1-git-send-email-awg+notmuch@xvx.ca>\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: Sun, 01 Apr 2012 00:33:31 -0000\r
+\r
+By default, emacs hides the User-Agent and References headers when\r
+composing mail. This is a good thing for users, but a bad thing for\r
+testing, since we can create ugly or invalid headers and not have it\r
+show up in the tests.\r
+\r
+By setting message-hidden-headers to an empty list, we force emacs to\r
+show all the headers, so we can check that they're correct. Users\r
+won't see this, but it will let us catch future bugs.\r
+\r
+As a side-effect, this breaks all the reply tests, since there is a\r
+bug with the References and User-Agent headers, fixed in the next commit.\r
+---\r
+ test/emacs | 55 +++++++++++++++++++++++++++++++++++++++++++------------\r
+ 1 files changed, 43 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 06291d3..7d00cae 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -256,17 +256,23 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs"\r
+-test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"")\r
++test_subtest_known_broken\r
++test_emacs '(let ((message-hidden-headers ''()))\r
++ (notmuch-search "subject:\"testing message sent via SMTP\"")\r
+ (notmuch-test-wait)\r
+ (notmuch-search-reply-to-thread)\r
+- (test-output)'\r
++ (test-output))'\r
+ sed -i -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/' OUTPUT\r
++sed -i -e 's/^References: <.*>$/References: <XXX>/' OUTPUT\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: user@example.com\r
+ Subject: Re: Testing message sent via SMTP\r
+ In-Reply-To: <XXX>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <XXX>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> writes:\r
+ \r
+@@ -275,19 +281,24 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply from alternate address within emacs"\r
++test_subtest_known_broken\r
+ add_message '[from]="Sender <sender@example.com>"' \\r
+ [to]=test_suite_other@notmuchmail.org\r
+ \r
+-test_emacs "(notmuch-search \"id:\\\"${gen_msg_id}\\\"\")\r
++test_emacs "(let ((message-hidden-headers '()))\r
++ (notmuch-search \"id:\\\"${gen_msg_id}\\\"\")\r
+ (notmuch-test-wait)\r
+ (notmuch-search-reply-to-thread)\r
+- (test-output)"\r
++ (test-output))"\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ To: Sender <sender@example.com>\r
+ Subject: Re: ${test_subtest_name}\r
+ In-Reply-To: <${gen_msg_id}>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <${gen_msg_id}>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Sender <sender@example.com> writes:\r
+ \r
+@@ -296,20 +307,25 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply from address in named group list within emacs"\r
++test_subtest_known_broken\r
+ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[to]=group:test_suite@notmuchmail.org,someone@example.com\;' \\r
+ [cc]=test_suite_other@notmuchmail.org\r
+ \r
+-test_emacs "(notmuch-search \"id:\\\"${gen_msg_id}\\\"\")\r
++test_emacs "(let ((message-hidden-headers '()))\r
++ (notmuch-search \"id:\\\"${gen_msg_id}\\\"\")\r
+ (notmuch-test-wait)\r
+ (notmuch-search-reply-to-thread)\r
+- (test-output)"\r
++ (test-output))"\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Sender <sender@example.com>, someone@example.com\r
+ Subject: Re: ${test_subtest_name}\r
+ In-Reply-To: <${gen_msg_id}>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <${gen_msg_id}>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Sender <sender@example.com> writes:\r
+ \r
+@@ -318,15 +334,20 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs to a multipart/mixed message"\r
+-test_emacs '(notmuch-show "id:20091118002059.067214ed@hikari")\r
++test_subtest_known_broken\r
++test_emacs '(let ((message-hidden-headers ''()))\r
++ (notmuch-show "id:20091118002059.067214ed@hikari")\r
+ (notmuch-show-reply)\r
+- (test-output)'\r
++ (test-output))'\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Adrian Perez de Castro <aperez@igalia.com>, notmuch@notmuchmail.org\r
+ Subject: Re: [notmuch] Introducing myself\r
+ In-Reply-To: <20091118002059.067214ed@hikari>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <20091118002059.067214ed@hikari>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Adrian Perez de Castro <aperez@igalia.com> writes:\r
+ \r
+@@ -377,15 +398,20 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs to a multipart/alternative message"\r
+-test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")\r
++test_subtest_known_broken\r
++test_emacs '(let ((message-hidden-headers ''()))\r
++ (notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")\r
+ (notmuch-show-reply)\r
+- (test-output)'\r
++ (test-output))'\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Alex Botero-Lowry <alex.boterolowry@gmail.com>, notmuch@notmuchmail.org\r
+ Subject: Re: [notmuch] preliminary FreeBSD support\r
+ In-Reply-To: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+ \r
+@@ -413,19 +439,24 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Quote MML tags in reply"\r
++test_subtest_known_broken\r
+ message_id='test-emacs-mml-quoting@message.id'\r
+ add_message [id]="$message_id" \\r
+ "[subject]='$test_subtest_name'" \\r
+ '[body]="<#part disposition=inline>"'\r
+-test_emacs "(notmuch-show \"id:$message_id\")\r
++test_emacs "(let ((message-hidden-headers '()))\r
++ (notmuch-show \"id:$message_id\")\r
+ (notmuch-show-reply)\r
+- (test-output)"\r
++ (test-output))"\r
++sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: \r
+ Subject: Re: Quote MML tags in reply\r
+ In-Reply-To: <test-emacs-mml-quoting@message.id>\r
+ Fcc: ${MAIL_DIR}/sent\r
++References: <test-emacs-mml-quoting@message.id>\r
++User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> writes:\r
+ \r
+-- \r
+1.7.5.4\r
+\r
projects / notmuch-archives.git / commitdiff