From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3ACB5429E27 for ; Thu, 17 Nov 2011 05:07:23 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NOQ3BC42+JXN for ; Thu, 17 Nov 2011 05:07:21 -0800 (PST) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 8E812421160 for ; Thu, 17 Nov 2011 05:06:47 -0800 (PST) Received: by mail-bw0-f53.google.com with SMTP id q10so2108356bka.26 for ; Thu, 17 Nov 2011 05:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=s+kOJaad6c98M+Btf8INY0/6kzZcHQXI+7LkJqfzxMg=; b=U6VB/hw/TlAegNvAoFAjgbnv2dnTm8F6REj9w0DcwEt4l7uTOkSDfmvO33Mv1MFGNC 5wBf35SXD2dkp7n0/GPJbQixxCDqTdM4sWWExIss72FHsqlHZzT3daGaExdeDBQVecEP 55DHL6O8BLtVxdneIX/kQWG0YuRnp3GLkvetA= Received: by 10.205.132.69 with SMTP id ht5mr25531707bkc.115.1321535207031; Thu, 17 Nov 2011 05:06:47 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id z15sm41226701bkv.4.2011.11.17.05.06.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Nov 2011 05:06:46 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH v2 10/10] test: fix "Stashing in notmuch-search" test when emacs is not available Date: Thu, 17 Nov 2011 17:06:03 +0400 Message-Id: <1321535163-4895-11-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.2 In-Reply-To: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Nov 2011 13:07:23 -0000 If emacs is not available, test_expect_equal would be called with only one argument. The patch fixes this by quoting the (possibly empty) $(cat OUTPUT) argument. --- test/emacs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/emacs b/test/emacs index 75a0a74..9883f40 100755 --- a/test/emacs +++ b/test/emacs @@ -364,41 +364,41 @@ test_emacs '(notmuch-show "id:\"bought\"") (switch-to-buffer (generate-new-buffer "*test-stashing*")) (dotimes (i 9) (yank) (insert "\n") (rotate-yank-pointer 1)) (reverse-region (point-min) (point-max)) (test-output)' sed -i -e 's/^.*tmp.emacs\/mail.*$/FILENAME/' OUTPUT test_expect_equal_file OUTPUT $EXPECTED/emacs-stashing test_begin_subtest "Stashing in notmuch-search" test_emacs '(notmuch-search "id:\"bought\"") (notmuch-test-wait) (notmuch-search-stash-thread-id) (switch-to-buffer (generate-new-buffer "*test-stashing*")) (yank) (test-output)' sed -i -e 's/^thread:.*$/thread:XXX/' OUTPUT -test_expect_equal $(cat OUTPUT) "thread:XXX" +test_expect_equal "$(cat OUTPUT)" "thread:XXX" test_begin_subtest 'Hiding message following HTML part' test_subtest_known_broken id='html-message@notmuchmail.org' emacs_deliver_message \ 'HTML message' \ '' \ "(message-goto-eoh) (insert \"Message-ID: <$id>\n\") (message-goto-body) (mml-insert-part \"text/html\") (insert \"This is a test HTML message\")" emacs_deliver_message \ 'Reply to HTML message' \ 'This is a reply to the test HTML message' \ "(message-goto-eoh) (insert \"In-Reply-To: <$id>\n\")" test_emacs "(notmuch-show \"id:$id\") \ (notmuch-show-next-message) \ (command-execute (key-binding (kbd \"RET\"))) \ -- 1.7.7.2