From: David Bremner <bremner@debian.org>
Date: Fri, 31 Aug 2012 01:05:51 +0000 (-0300)
Subject: test: use (format "%S") to print nil in emacs test.
X-Git-Tag: 0.15_rc1~260
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ba01608d7a14ecd98e371be5bacc062d67e5b7b;p=notmuch.git

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

The behaviour of "emacsclient --eval nil" changed from emacs23 to
emacs24, and in emacs24 it prints 'nil' rather than an empty string.

(format "%S" foo) produces a sexpr form of foo, and is consistent
between the two versions.
---

diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename
index 176e6859..a0ffdfef 100755
--- a/test/emacs-subject-to-filename
+++ b/test/emacs-subject-to-filename
@@ -8,10 +8,10 @@ test_emacs '(ignore)'
 
 # test notmuch-wash-subject-to-patch-sequence-number (subject)
 test_begin_subtest "no patch sequence number"
-output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number
-      "[PATCH] A normal patch subject without numbers")'
+output=$(test_emacs '(format "%S" (notmuch-wash-subject-to-patch-sequence-number
+      "[PATCH] A normal patch subject without numbers"))'
 )
-test_expect_equal "$output" ""
+test_expect_equal "$output" '"nil"'
 
 test_begin_subtest "patch sequence number #1"
 output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number