Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C0409429E33 for ; Fri, 13 May 2011 01:18:08 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 Akzis7NRvILm for ; Fri, 13 May 2011 01:18:07 -0700 (PDT) Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 95A7A431FD0 for ; Fri, 13 May 2011 01:18:05 -0700 (PDT) Received: by mail-wy0-f181.google.com with SMTP id 11so1911216wyi.26 for ; Fri, 13 May 2011 01:18:05 -0700 (PDT) Received: by 10.216.62.195 with SMTP id y45mr1252528wec.15.1305274685197; Fri, 13 May 2011 01:18:05 -0700 (PDT) Received: from localhost (54.209-242-81.adsl-dyn.isp.belgacom.be [81.242.209.54]) by mx.google.com with ESMTPS id h39sm1001346wes.29.2011.05.13.01.18.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 May 2011 01:18:04 -0700 (PDT) From: Pieter Praet To: Notmuch Mail Subject: [PATCH 4/4] test: add 'Emacs' prereq to 'emacs-large-search-buffer' tests Date: Fri, 13 May 2011 10:17:16 +0200 Message-Id: <1305274636-19975-5-git-send-email-pieter@praet.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1305274636-19975-1-git-send-email-pieter@praet.org> References: <1305274636-19975-1-git-send-email-pieter@praet.org> Cc: Austin Clements 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: Fri, 13 May 2011 08:18:09 -0000 Signed-off-by: Pieter Praet --- test/emacs-large-search-buffer | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer index 2751a32..54b1827 100755 --- a/test/emacs-large-search-buffer +++ b/test/emacs-large-search-buffer @@ -2,6 +2,11 @@ test_description="Emacs with large search results buffer" . test-lib.sh +# Emacs is a prereq. +if test_expect_success "prereq: Emacs is present" "which emacs"; then + test_set_prereq EMACS +fi + x=xxxxxxxxxx # 10 x=$x$x$x$x$x$x$x$x$x$x # 100 x=$x$x$x$x$x$x$x$x$x # 900 @@ -23,11 +28,11 @@ expected="$(notmuch search '*' | sed -e 's/^thread:[0-9a-f]* //' -e 's/;//' -e End of search results." output=$(test_emacs '(notmuch-search "*") (notmuch-test-wait) (princ (buffer-string))' | sed -e s', *, ,g' -e 's/xxx*/[BLOB]/g') -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$output" "$expected" test_begin_subtest "Ensure that emacs doesn't drop error messages" output=$(test_emacs '(notmuch-search "--this-option-does-not-exist") (notmuch-test-wait) (princ (buffer-string))') -test_expect_equal "$output" "Error: Unexpected output from notmuch search: +test_expect_equal EMACS "$output" "Error: Unexpected output from notmuch search: Unrecognized option: --this-option-does-not-exist End of search results. (process returned 1)" -- 1.7.4.1