[PATCH] test: Quote $output in calls to test_expect_equal

diff --git a/ae/85cd3ef4700b9a4b1ebec3298246fc49aa8c72 b/ae/85cd3ef4700b9a4b1ebec3298246fc49aa8c72
new file mode 100644 (file)
index 0000000..84b11db
--- /dev/null
+++ b/ae/85cd3ef4700b9a4b1ebec3298246fc49aa8c72
@@ -0,0 +1,155 @@
+Return-Path: <amdragon@mit.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 534B0431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Nov 2012 20:58:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 528Swl4YVmpA for <notmuch@notmuchmail.org>;\r
+       Mon, 26 Nov 2012 20:58:22 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5AC0A431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Nov 2012 20:58:22 -0800 (PST)\r
+X-AuditID: 12074422-b7f196d00000398d-88-50b4486d407c\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 6B.FA.14733.D6844B05; Mon, 26 Nov 2012 23:58:21 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qAR4wK5X006906; \r
+       Mon, 26 Nov 2012 23:58:20 -0500\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAR4wIlw024159\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 26 Nov 2012 23:58:20 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TdDFS-0003m5-FT; Mon, 26 Nov 2012 23:58:18 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: Quote $output in calls to test_expect_equal\r
+Date: Mon, 26 Nov 2012 23:58:17 -0500\r
+Message-Id: <1353992297-14473-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsUixG6nopvrsSXA4MtDM4vrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY/uxQ2wFvyQrvu5SaGDcKtbFyMEhIWAisX+uXxcjJ5ApJnHh\r
+       3nq2LkYuDiGBfYwSU57OZodwNjBKfHrUyQZSJSTwiEli94l0iMRcRoneM39YQBJsAhoS2/Yv\r
+       ZwSxRQSkJXbenc0KsoFZQE3iT5cKSFhYIEPiwPedTCA2i4CqxK/W92wgJbwCDhIHfqhCHKEo\r
+       0f1sAtgqXgFBiZMzn7BATFGXWD9PCCTMLCAv0bx1NvMERoFZSKpmIVTNQlK1gJF5FaNsSm6V\r
+       bm5iZk5xarJucXJiXl5qka6pXm5miV5qSukmRnAouijtYPx5UOkQowAHoxIP74ElmwOEWBPL\r
+       iitzDzFKcjApifIecd8SIMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEd7EOUI43JbGyKrUoHyYl\r
+       zcGiJM57LeWmv5BAemJJanZqakFqEUxWhoNDSYJ3KshQwaLU9NSKtMycEoQ0EwcnyHAeoOH5\r
+       IDW8xQWJucWZ6RD5U4yKUuK8k9yAEgIgiYzSPLheWKp4xSgO9IowbzVIOw8wzcB1vwIazAQ0\r
+       OPn6RpDBJYkIKakGxhXTHvAd/uJXJ82+dP9My1NNsx/PyXu0WlmwQWTGBR371VMSql+tvvKg\r
+       Yb/Fxxfn2T69r5335IPrHLWzZhN+xiu6fZrKXZeXvP73adczD5jYl00p7CmKqHj5/vG6aV7x\r
+       rL0p2ZtiV0+zm3ppA2tnxLf+wnizyavuXUtc/Ibp4zKpsAuT2K7kbLBSYinOSDTUYi4qTgQA\r
+       Nezv1fACAAA=\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: Tue, 27 Nov 2012 04:58:24 -0000\r
+\r
+Previously, many tests in emacs-subject-to-filename didn't quote the\r
+$output argument to test_expect_equal.  As a result, if $output was\r
+empty, test_expect_equal would be passed only one argument and would\r
+abort the entire test script.  By quoting the argument, we ensure\r
+test_expect_equal will always receive two arguments.\r
+---\r
+ test/emacs-subject-to-filename |   18 +++++++++---------\r
+ 1 file changed, 9 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename\r
+index a0ffdfe..1e94a98 100755\r
+--- a/test/emacs-subject-to-filename\r
++++ b/test/emacs-subject-to-filename\r
+@@ -60,55 +60,55 @@ test_begin_subtest "filename #1"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "just a subject line")'\r
+ )\r
+-test_expect_equal $output '"just-a-subject-line"'\r
++test_expect_equal "$output" '"just-a-subject-line"'\r
+ \r
+ test_begin_subtest "filename #2"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       " [any]  [prefixes are ] [removed!] from the subject")'\r
+ )\r
+-test_expect_equal $output '"from-the-subject"'\r
++test_expect_equal "$output" '"from-the-subject"'\r
+ \r
+ test_begin_subtest "filename #3"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "  leading and trailing space  ")'\r
+ )\r
+-test_expect_equal $output '"leading-and-trailing-space"'\r
++test_expect_equal "$output" '"leading-and-trailing-space"'\r
+ \r
+ test_begin_subtest "filename #4"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "!#  leading ()// &%, and in between_and_trailing garbage ()(&%%")'\r
+ )\r
+-test_expect_equal $output '"-leading-and-in-between_and_trailing-garbage"'\r
++test_expect_equal "$output" '"-leading-and-in-between_and_trailing-garbage"'\r
+ \r
+ test_begin_subtest "filename #5"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_01234567890")'\r
+ )\r
+-test_expect_equal $output '"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_01234567890"'\r
++test_expect_equal "$output" '"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_01234567890"'\r
+ \r
+ test_begin_subtest "filename #6"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "sequences of ... are squashed and trailing are removed ...")'\r
+ )\r
+-test_expect_equal $output '"sequences-of-.-are-squashed-and-trailing-are-removed"'\r
++test_expect_equal "$output" '"sequences-of-.-are-squashed-and-trailing-are-removed"'\r
+ \r
+ test_begin_subtest "filename #7"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "max length test" 1)'\r
+ )\r
+-test_expect_equal $output '"m"'\r
++test_expect_equal "$output" '"m"'\r
+ \r
+ test_begin_subtest "filename #8"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "max length test /&(/%&/%%&¤%¤" 20)'\r
+ )\r
+-test_expect_equal $output '"max-length-test"'\r
++test_expect_equal "$output" '"max-length-test"'\r
+ \r
+ test_begin_subtest "filename #9"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-filename\r
+       "[a prefix] [is only separated] by [spaces], so \"by\" is not okay!")'\r
+ )\r
+-test_expect_equal $output '"by-spaces-so-by-is-not-okay"'\r
++test_expect_equal "$output" '"by-spaces-so-by-is-not-okay"'\r
+ \r
+ # test notmuch-wash-subject-to-patch-filename (subject)\r
+ test_begin_subtest "patch filename #1"\r
+-- \r
+1.7.10.4\r
+\r