[PATCH] test: use (format "%S") to print nil in emacs test.

diff --git a/06/5024d7bbf1f82c71a6d4d66b8ed8ac3c3b1f1d b/06/5024d7bbf1f82c71a6d4d66b8ed8ac3c3b1f1d
new file mode 100644 (file)
index 0000000..b89af04
--- /dev/null
+++ b/06/5024d7bbf1f82c71a6d4d66b8ed8ac3c3b1f1d
@@ -0,0 +1,90 @@
+Return-Path: <bremner@tethera.net>\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 51375431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 18:10:24 -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 tests=[none]\r
+       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 QJ66mnuWV3nn for <notmuch@notmuchmail.org>;\r
+       Thu, 30 Aug 2012 18:10:23 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DD9D0431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 18:10:23 -0700 (PDT)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1T7Fkc-0004Hh-I4; Thu, 30 Aug 2012 22:10:22 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1T7FkX-000091-0x; Thu, 30 Aug 2012 22:10:17 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: use (format "%S") to print nil in emacs test.\r
+Date: Thu, 30 Aug 2012 22:09:59 -0300\r
+Message-Id: <1346375399-449-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Fri, 31 Aug 2012 01:10:24 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The behaviour of "emacsclient --eval nil" changed from emacs23 to\r
+emacs24, and in emacs24 it prints 'nil' rather than an empty string.\r
+\r
+(format "%S" foo) produces a sexpr form of foo, and is consistent\r
+between the two versions.\r
+---\r
+\r
+This fixes another test failure on emacs24. \r
+\r
+I guess maybe all test_emacs output could be canonicalized this way,\r
+but I suspect that would be pretty disruptive.\r
+\r
+ test/emacs-subject-to-filename |    6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename\r
+index 176e685..a0ffdfe 100755\r
+--- a/test/emacs-subject-to-filename\r
++++ b/test/emacs-subject-to-filename\r
+@@ -8,10 +8,10 @@ test_emacs '(ignore)'\r
+ \r
+ # test notmuch-wash-subject-to-patch-sequence-number (subject)\r
+ test_begin_subtest "no patch sequence number"\r
+-output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number\r
+-      "[PATCH] A normal patch subject without numbers")'\r
++output=$(test_emacs '(format "%S" (notmuch-wash-subject-to-patch-sequence-number\r
++      "[PATCH] A normal patch subject without numbers"))'\r
+ )\r
+-test_expect_equal "$output" ""\r
++test_expect_equal "$output" '"nil"'\r
+ \r
+ test_begin_subtest "patch sequence number #1"\r
+ output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number\r
+-- \r
+1.7.10.4\r
+\r