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 771E3429E28 for ; Sat, 28 May 2011 14:52:23 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.921 X-Spam-Level: X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3] 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 q0IDQn-ZriCi for ; Sat, 28 May 2011 14:52:22 -0700 (PDT) Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu [131.215.239.19]) by olra.theworths.org (Postfix) with ESMTP id 09839429E33 for ; Sat, 28 May 2011 14:52:15 -0700 (PDT) Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) by fire-doxen-postvirus (Postfix) with ESMTP id 5F4D52E50E75; Sat, 28 May 2011 14:45:47 -0700 (PDT) X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com [98.149.172.122]) (Authenticated sender: jrollins) by fire-doxen-submit (Postfix) with ESMTP id B5DB732808F; Sat, 28 May 2011 14:45:42 -0700 (PDT) Received: by servo.finestructure.net (Postfix, from userid 1000) id 298E5791; Sat, 28 May 2011 14:52:05 -0700 (PDT) From: Jameson Graef Rollins To: Notmuch Mail Subject: [PATCH 07/25] test: remove json test for search null result, since it's being more properly tested in search-output Date: Sat, 28 May 2011 14:51:42 -0700 Message-Id: <1306619520-25730-8-git-send-email-jrollins@finestructure.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306619520-25730-7-git-send-email-jrollins@finestructure.net> References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net> <1306619520-25730-2-git-send-email-jrollins@finestructure.net> <1306619520-25730-3-git-send-email-jrollins@finestructure.net> <1306619520-25730-4-git-send-email-jrollins@finestructure.net> <1306619520-25730-5-git-send-email-jrollins@finestructure.net> <1306619520-25730-6-git-send-email-jrollins@finestructure.net> <1306619520-25730-7-git-send-email-jrollins@finestructure.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 28 May 2011 21:52:23 -0000 The test in json was inferior to the one in search-output, since it wasn't properly testing for the presence of a trailing newline. --- test/json | 4 ---- test/search-output | 4 +--- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/test/json b/test/json index 0badb1d..5a2544c 100755 --- a/test/json +++ b/test/json @@ -34,8 +34,4 @@ test_expect_equal "$output" "[{\"thread\": \"XXX\", \"subject\": \"json-search-utf8-body-sübjéct\", \"tags\": [\"inbox\", \"unread\"]}]" -test_begin_subtest "Search returning no messages" -output=$(notmuch search --format=json "this string had better not match any messages" | notmuch_search_sanitize) -test_expect_equal "$output" "[]" - test_done diff --git a/test/search-output b/test/search-output index 8ba8acf..13f9613 100755 --- a/test/search-output +++ b/test/search-output @@ -311,9 +311,7 @@ test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json" notmuch search --format=json "no-message-matches-this" > OUTPUT -cat <EXPECTED -[] -EOF +echo "[]" >EXPECTED test_expect_equal_file OUTPUT EXPECTED test_done -- 1.7.4.4