1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 51375431FAF
\r
6 for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 18:10:24 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id QJ66mnuWV3nn for <notmuch@notmuchmail.org>;
\r
16 Thu, 30 Aug 2012 18:10:23 -0700 (PDT)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id DD9D0431FAE
\r
21 for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 18:10:23 -0700 (PDT)
\r
22 Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.89.108] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1T7Fkc-0004Hh-I4; Thu, 30 Aug 2012 22:10:22 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1T7FkX-000091-0x; Thu, 30 Aug 2012 22:10:17 -0300
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] test: use (format "%S") to print nil in emacs test.
\r
34 Date: Thu, 30 Aug 2012 22:09:59 -0300
\r
35 Message-Id: <1346375399-449-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Fri, 31 Aug 2012 01:10:24 -0000
\r
53 From: David Bremner <bremner@debian.org>
\r
55 The behaviour of "emacsclient --eval nil" changed from emacs23 to
\r
56 emacs24, and in emacs24 it prints 'nil' rather than an empty string.
\r
58 (format "%S" foo) produces a sexpr form of foo, and is consistent
\r
59 between the two versions.
\r
62 This fixes another test failure on emacs24.
\r
64 I guess maybe all test_emacs output could be canonicalized this way,
\r
65 but I suspect that would be pretty disruptive.
\r
67 test/emacs-subject-to-filename | 6 +++---
\r
68 1 file changed, 3 insertions(+), 3 deletions(-)
\r
70 diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename
\r
71 index 176e685..a0ffdfe 100755
\r
72 --- a/test/emacs-subject-to-filename
\r
73 +++ b/test/emacs-subject-to-filename
\r
74 @@ -8,10 +8,10 @@ test_emacs '(ignore)'
\r
76 # test notmuch-wash-subject-to-patch-sequence-number (subject)
\r
77 test_begin_subtest "no patch sequence number"
\r
78 -output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number
\r
79 - "[PATCH] A normal patch subject without numbers")'
\r
80 +output=$(test_emacs '(format "%S" (notmuch-wash-subject-to-patch-sequence-number
\r
81 + "[PATCH] A normal patch subject without numbers"))'
\r
83 -test_expect_equal "$output" ""
\r
84 +test_expect_equal "$output" '"nil"'
\r
86 test_begin_subtest "patch sequence number #1"
\r
87 output=$(test_emacs '(notmuch-wash-subject-to-patch-sequence-number
\r