--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4D443429E5A\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 1GJCsLJHbdKP for <notmuch@notmuchmail.org>;\r
+ Sat, 26 Oct 2013 15:02:20 -0700 (PDT)\r
+Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com\r
+ [74.125.82.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 5416F429E42 for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:17 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f42.google.com with SMTP id n12so2149305wgh.5\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:16 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=ScyFaTvWFGQO5KmJA0ddraqtV1Ac65/3gFp90psXRB4=;\r
+ b=OYVhbzkmQeA91a3WRUTIA+AlKu/5BaZeqE0g9cYfXjAyNXj9I/XlxdzXy8bCAJ+XfV\r
+ /fCabWVFTOiFL+quWYTQ9xOEcESYaLiZ1+fR4PwN0FhNQ79z2ngSCioOHG74+4OU1275\r
+ +CpOLH3RauvKP60szvu9rj0tB+DRCkY8OSIp4sKhdgxtWYMdhS+KFUry0jjzg0NaWmOA\r
+ zqDFvlxelFFZRdx9PmU0PMCbcWalWT+paj3xvET2FcICmgKTErDL9o6c7snq+dBPolvR\r
+ XCuzG2FZB5yiFccZ2JOxr1Nbeo6021M3M06l1lFRlT+IYBhx7r/JzgeI72nV++UybRE7\r
+ opJQ==\r
+X-Received: by 10.194.11.67 with SMTP id o3mr12909936wjb.0.1382824936175;\r
+ Sat, 26 Oct 2013 15:02:16 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id\r
+ bs15sm19764627wib.10.2013.10.26.15.02.15 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 26 Oct 2013 15:02:15 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/4] pick: Change the test names and print out for pick tests\r
+Date: Sat, 26 Oct 2013 23:02:06 +0100\r
+Message-Id: <1382824928-3771-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 26 Oct 2013 22:02:25 -0000\r
+\r
+Change from the pick name to the tree name\r
+---\r
+ contrib/notmuch-pick/test/emacs-pick | 28 ++++++++++++++--------------\r
+ 1 files changed, 14 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick\r
+index fae6e9e..2cc3edc 100755\r
+--- a/contrib/notmuch-pick/test/emacs-pick\r
++++ b/contrib/notmuch-pick/test/emacs-pick\r
+@@ -1,6 +1,6 @@\r
+ #!/usr/bin/env bash\r
+ \r
+-test_description="emacs pick interface"\r
++test_description="emacs tree view interface"\r
+ . test-lib.sh\r
+ \r
+ EXPECTED=$TEST_DIRECTORY/pick.expected-output\r
+@@ -14,7 +14,7 @@ hello\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-test_begin_subtest "Basic notmuch-pick view in emacs"\r
++test_begin_subtest "Basic notmuch-tree view in emacs"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -23,7 +23,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ \r
+-test_begin_subtest "Refreshed notmuch-pick view in emacs"\r
++test_begin_subtest "Refreshed notmuch-tree view in emacs"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -38,7 +38,7 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ # correctly and, in a separate test, that the database is updated\r
+ # correctly.\r
+ \r
+-test_begin_subtest "Tag message in notmuch pick view (display)"\r
++test_begin_subtest "Tag message in notmuch tree view (display)"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -49,11 +49,11 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged\r
+ \r
+-test_begin_subtest "Tag message in notmuch pick view (database)"\r
++test_begin_subtest "Tag message in notmuch tree view (database)"\r
+ output=$(notmuch search --output=messages 'tag:test_tag')\r
+ test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
+ \r
+-test_begin_subtest "Untag message in notmuch pick view"\r
++test_begin_subtest "Untag message in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -64,11 +64,11 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ \r
+-test_begin_subtest "Untag message in notmuch pick view (database)"\r
++test_begin_subtest "Untag message in notmuch tree view (database)"\r
+ output=$(notmuch search --output=messages 'tag:test_tag')\r
+ test_expect_equal "$output" ""\r
+ \r
+-test_begin_subtest "Tag thread in notmuch pick view"\r
++test_begin_subtest "Tag thread in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -80,7 +80,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-thread-tagged\r
+ \r
+-test_begin_subtest "Tag message in notmuch pick view (database)"\r
++test_begin_subtest "Tag message in notmuch tree view (database)"\r
+ output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
+ test_expect_equal "$output" \\r
+ "id:87ocn0qh6d.fsf@yoom.home.cworth.org\r
+@@ -91,7 +91,7 @@ id:20091117203301.GV3165@dottiness.seas.harvard.edu\r
+ id:87iqd9rn3l.fsf@vertex.dottedmag\r
+ id:20091117190054.GU3165@dottiness.seas.harvard.edu"\r
+ \r
+-test_begin_subtest "Untag thread in notmuch pick view"\r
++test_begin_subtest "Untag thread in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (require (quote notmuch-tree))\r
+ (notmuch-tree "tag:inbox")\r
+@@ -103,7 +103,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ \r
+-test_begin_subtest "Untag message in notmuch pick view (database)"\r
++test_begin_subtest "Untag message in notmuch tree view (database)"\r
+ output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
+ test_expect_equal "$output" ""\r
+ \r
+@@ -119,7 +119,7 @@ test_emacs '(notmuch-hello)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ \r
+-test_begin_subtest "Pick of a single thread (from search)"\r
++test_begin_subtest "Tree view of a single thread (from search)"\r
+ test_emacs '(notmuch-hello)\r
+ (goto-char (point-min))\r
+ (re-search-forward "inbox")\r
+@@ -131,7 +131,7 @@ test_emacs '(notmuch-hello)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread\r
+ \r
+-test_begin_subtest "Pick of a single thread (from show)"\r
++test_begin_subtest "Tree view of a single thread (from show)"\r
+ test_emacs '(notmuch-hello)\r
+ (goto-char (point-min))\r
+ (re-search-forward "inbox")\r
+@@ -144,7 +144,7 @@ test_emacs '(notmuch-hello)\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread\r
+ \r
+-test_begin_subtest "Message window of pick"\r
++test_begin_subtest "Message window of tree view"\r
+ test_emacs '(notmuch-hello)\r
+ (goto-char (point-min))\r
+ (re-search-forward "inbox")\r
+-- \r
+1.7.9.1\r
+\r