1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 3ACB5429E27
\r
6 for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:07:23 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id NOQ3BC42+JXN for <notmuch@notmuchmail.org>;
\r
17 Thu, 17 Nov 2011 05:07:21 -0800 (PST)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 8E812421160
\r
22 for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:06:47 -0800 (PST)
\r
23 Received: by mail-bw0-f53.google.com with SMTP id q10so2108356bka.26
\r
24 for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:06:47 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=s+kOJaad6c98M+Btf8INY0/6kzZcHQXI+7LkJqfzxMg=;
\r
28 b=U6VB/hw/TlAegNvAoFAjgbnv2dnTm8F6REj9w0DcwEt4l7uTOkSDfmvO33Mv1MFGNC
\r
29 5wBf35SXD2dkp7n0/GPJbQixxCDqTdM4sWWExIss72FHsqlHZzT3daGaExdeDBQVecEP
\r
30 55DHL6O8BLtVxdneIX/kQWG0YuRnp3GLkvetA=
\r
31 Received: by 10.205.132.69 with SMTP id ht5mr25531707bkc.115.1321535207031;
\r
32 Thu, 17 Nov 2011 05:06:47 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id z15sm41226701bkv.4.2011.11.17.05.06.45
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Thu, 17 Nov 2011 05:06:46 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v2 10/10] test: fix "Stashing in notmuch-search" test when
\r
40 emacs is not available
\r
41 Date: Thu, 17 Nov 2011 17:06:03 +0400
\r
42 Message-Id: <1321535163-4895-11-git-send-email-dmitry.kurochkin@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.7.2
\r
44 In-Reply-To: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 References: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Thu, 17 Nov 2011 13:07:23 -0000
\r
60 If emacs is not available, test_expect_equal would be called with only
\r
61 one argument. The patch fixes this by quoting the (possibly empty)
\r
62 $(cat OUTPUT) argument.
\r
65 1 files changed, 1 insertions(+), 1 deletions(-)
\r
67 diff --git a/test/emacs b/test/emacs
\r
68 index 75a0a74..9883f40 100755
\r
71 @@ -364,41 +364,41 @@ test_emacs '(notmuch-show "id:\"bought\"")
\r
73 (generate-new-buffer "*test-stashing*"))
\r
77 (rotate-yank-pointer 1))
\r
78 (reverse-region (point-min) (point-max))
\r
80 sed -i -e 's/^.*tmp.emacs\/mail.*$/FILENAME/' OUTPUT
\r
81 test_expect_equal_file OUTPUT $EXPECTED/emacs-stashing
\r
83 test_begin_subtest "Stashing in notmuch-search"
\r
84 test_emacs '(notmuch-search "id:\"bought\"")
\r
86 (notmuch-search-stash-thread-id)
\r
88 (generate-new-buffer "*test-stashing*"))
\r
91 sed -i -e 's/^thread:.*$/thread:XXX/' OUTPUT
\r
92 -test_expect_equal $(cat OUTPUT) "thread:XXX"
\r
93 +test_expect_equal "$(cat OUTPUT)" "thread:XXX"
\r
95 test_begin_subtest 'Hiding message following HTML part'
\r
96 test_subtest_known_broken
\r
97 id='html-message@notmuchmail.org'
\r
98 emacs_deliver_message \
\r
101 "(message-goto-eoh)
\r
102 (insert \"Message-ID: <$id>\n\")
\r
103 (message-goto-body)
\r
104 (mml-insert-part \"text/html\")
\r
105 (insert \"<body>This is a test HTML message</body>\")"
\r
106 emacs_deliver_message \
\r
107 'Reply to HTML message' \
\r
108 'This is a reply to the test HTML message' \
\r
109 "(message-goto-eoh)
\r
110 (insert \"In-Reply-To: <$id>\n\")"
\r
111 test_emacs "(notmuch-show \"id:$id\") \
\r
112 (notmuch-show-next-message) \
\r
113 (command-execute (key-binding (kbd \"RET\"))) \
\r