Return-Path: <jrollins@servo.finestructure.net>
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 E9925429E43
	for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:17 -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 Owb2wwwbfLgh for <notmuch@notmuchmail.org>;
	Sat, 28 May 2011 14:52:16 -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 BD60D429E2A
	for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:13 -0700 (PDT)
Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])
	by earth-doxen-postvirus (Postfix) with ESMTP id 4B07C66E019B;
	Sat, 28 May 2011 14:52:12 -0700 (PDT)
X-Spam-Scanned: at Caltech-IMSS on earth-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 earth-doxen-submit (Postfix) with ESMTP id 4F6A366E024E;
	Sat, 28 May 2011 14:52:09 -0700 (PDT)
Received: by servo.finestructure.net (Postfix, from userid 1000)
	id 39B2B7D6; Sat, 28 May 2011 14:52:05 -0700 (PDT)
From: Jameson Graef Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 12/25] test: cleanup search-output test names (no functional
	change)
Date: Sat, 28 May 2011 14:51:47 -0700
Message-Id: <1306619520-25730-13-git-send-email-jrollins@finestructure.net>
X-Mailer: git-send-email 1.7.4.4
In-Reply-To: <1306619520-25730-12-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>
	<1306619520-25730-8-git-send-email-jrollins@finestructure.net>
	<1306619520-25730-9-git-send-email-jrollins@finestructure.net>
	<1306619520-25730-10-git-send-email-jrollins@finestructure.net>
	<1306619520-25730-11-git-send-email-jrollins@finestructure.net>
	<1306619520-25730-12-git-send-email-jrollins@finestructure.net>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 28 May 2011 21:52:18 -0000

Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>
---
 test/search-output |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/search-output b/test/search-output
index 8edc26a..02cf602 100755
--- a/test/search-output
+++ b/test/search-output
@@ -4,7 +4,7 @@ test_description='various settings for "notmuch search --output="'
 
 add_email_corpus
 
-test_begin_subtest "notmuch search --output=threads"
+test_begin_subtest "--output=threads"
 notmuch search --output=threads '*' | sed -e s/thread:.*/thread:THREADID/ >OUTPUT
 cat <<EOF >EXPECTED
 thread:THREADID
@@ -32,7 +32,7 @@ thread:THREADID
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --format=json --output=threads"
+test_begin_subtest "--output=threads --format=json"
 notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT
 cat <<EOF >EXPECTED
 ["THREADID",
@@ -60,7 +60,7 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --output=messages"
+test_begin_subtest "--output=messages"
 notmuch search --output=messages '*' >OUTPUT
 cat <<EOF >EXPECTED
 id:1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk
@@ -116,7 +116,7 @@ id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --format=json --output=messages"
+test_begin_subtest "--output=messages --format=json"
 notmuch search --format=json --output=messages '*' >OUTPUT
 cat <<EOF >EXPECTED
 ["1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk",
@@ -172,7 +172,7 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --output=files"
+test_begin_subtest "--output=files"
 notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
 cat <<EOF >EXPECTED
 MAIL_DIR/cur/50:2,
@@ -228,7 +228,7 @@ MAIL_DIR/cur/01:2,
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --format=json --output=files"
+test_begin_subtest "--output=files --format=json"
 notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
 cat <<EOF >EXPECTED
 ["MAIL_DIR/cur/50:2,",
@@ -284,7 +284,7 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --output=tags"
+test_begin_subtest "--output=tags"
 notmuch search --output=tags '*' >OUTPUT
 cat <<EOF >EXPECTED
 attachment
@@ -294,7 +294,7 @@ unread
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --format=json --output=tags"
+test_begin_subtest "--output=tags --format=json"
 notmuch search --format=json --output=tags '*' >OUTPUT
 cat <<EOF >EXPECTED
 ["attachment",
@@ -313,12 +313,12 @@ thread:000000000000001b   2001-01-05 [1/1] Notmuch Test Suite; two line? subject
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search for non-existent message prints nothing"
+test_begin_subtest "search for non-existent message prints nothing"
 notmuch search "no-message-matches-this" > OUTPUT
 echo -n >EXPECTED
 test_expect_equal_file OUTPUT EXPECTED
 
-test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json"
+test_begin_subtest "search --format=json for non-existent message prints proper empty json"
 notmuch search --format=json "no-message-matches-this" > OUTPUT
 echo "[]" >EXPECTED
 test_expect_equal_file OUTPUT EXPECTED
-- 
1.7.4.4