[v2 2/3] test-lib: Add dummy subject to force empty subject

diff --git a/f0/69b835a81dd67eb83e3e0f3eb0e232b365728c b/f0/69b835a81dd67eb83e3e0f3eb0e232b365728c
new file mode 100644 (file)
index 0000000..2f14f9e
--- /dev/null
+++ b/f0/69b835a81dd67eb83e3e0f3eb0e232b365728c
@@ -0,0 +1,71 @@
+Return-Path: <prvs=372b3579b=jrosenthal@jhu.edu>\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 86ADB431FDD\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Oct 2014 13:52:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 TlxWAFudSMzl for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Oct 2014 13:52:20 -0700 (PDT)\r
+Received: from IPMTW1.johnshopkins.edu (ipmtw1.johnshopkins.edu\r
+       [128.220.229.140]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 52C93431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Oct 2014 13:52:13 -0700 (PDT)\r
+X-IronPort-AV: E=Sophos;i="5.07,279,1413259200"; d="scan'208";a="15776389"\r
+Received: from guppy.hwcampus.jhu.edu (HELO localhost) ([10.161.32.234])\r
+       by IPMTW1.johnshopkins.edu with ESMTP/TLS/AES128-SHA;\r
+       29 Oct 2014 16:52:11 -0400\r
+From: Jesse Rosenthal <jrosenthal@jhu.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [v2 2/3] test-lib: Add dummy subject to force empty subject\r
+Date: Wed, 29 Oct 2014 16:51:44 -0400\r
+Message-Id: <1414615905-22554-3-git-send-email-jrosenthal@jhu.edu>\r
+X-Mailer: git-send-email 2.1.2\r
+In-Reply-To: <1414615905-22554-1-git-send-email-jrosenthal@jhu.edu>\r
+References: <1414615905-22554-1-git-send-email-jrosenthal@jhu.edu>\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, 29 Oct 2014 20:52:25 -0000\r
+\r
+At the moment, the test-lib fills in any missing headers. This makes\r
+it impossible to test our handling of empty subjects. This will\r
+allow us to use a special dummy subject -- `@FORCE_EMPTY` -- to force\r
+the subject to remain empty.\r
+---\r
+ test/test-lib.sh | 2 ++\r
+ 1 file changed, 2 insertions(+)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 53db9ca..6057238 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -368,6 +368,8 @@ generate_message ()\r
+       else\r
+           template[subject]="Test message #${gen_msg_cnt}"\r
+       fi\r
++    elif [ "${template[subject]}" = "@FORCE_EMPTY" ]; then\r
++      template[subject]=""\r
+     fi\r
+ \r
+     if [ -z "${template[date]}" ]; then\r
+-- \r
+2.1.2\r
+\r