[PATCH] test: tree: pick remnants removed

diff --git a/dc/e2cd95b753bebedbec23c7ed57676cb3eab708 b/dc/e2cd95b753bebedbec23c7ed57676cb3eab708
new file mode 100644 (file)
index 0000000..9a4b59f
--- /dev/null
+++ b/dc/e2cd95b753bebedbec23c7ed57676cb3eab708
@@ -0,0 +1,195 @@
+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 34DE7431FD0\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 14:58:47 -0800 (PST)\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 9RMsqLRVveYu for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Dec 2013 14:58:40 -0800 (PST)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 77413431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 14:58:40 -0800 (PST)\r
+Received: by mail-wi0-f169.google.com with SMTP id hn6so704999wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 14:58:39 -0800 (PST)\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;\r
+       bh=7f7IzIOFShofTwnwyyvyV096EtMfD1korKPSVV3Wuuw=;\r
+       b=m24aYFqJuGRMM+qBV0b3cw81/29ZwQkfACNCyeVWOoEGrj9KDEobhyRkVM31IhEmMg\r
+       TQeFJf35ydWUS0kkM94ErQXQkq1jwNJ9tz6fvoraAyI2IKRSBm/jiYJC3vdG31hxSipP\r
+       TjjB6mM0M0ShJm3Z6+15y52B7KCzbaidZ7CdgcKqDZgBkZ20QW07pG9SRxq3GvWokgjY\r
+       i0KKBDI5Cfsj/eP78YwlpOzPonFodguKfUE0rIMIyR1mWMGGvvPxOTB4AhLVP6HGFxm+\r
+       MjXPWrfKX65Z1qbGWxxDFWwpi9B9a7aM4hcFZieJQfBv46lvI+cSY0QaseQ8d0mT4LWx\r
+       HGqA==\r
+X-Received: by 10.194.235.230 with SMTP id up6mr7850778wjc.30.1387061917737;\r
+       Sat, 14 Dec 2013 14:58:37 -0800 (PST)\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
+       xn17sm10842024wib.1.2013.12.14.14.58.36 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 14 Dec 2013 14:58:37 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: tree: pick remnants removed\r
+Date: Sat, 14 Dec 2013 22:58:32 +0000\r
+Message-Id: <1387061912-24349-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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, 14 Dec 2013 22:58:47 -0000\r
+\r
+Some no longer needed traces of pick remain in the emacs-tree\r
+test. Remove these.\r
+---\r
+When playing with tree read/unread things I found these remnants in\r
+the emacs-tree test. They do no harm but should be removed. Sorry I\r
+missed these in the pick/tree merge.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+ test/emacs-tree |   38 +++++++++++---------------------------\r
+ 1 files changed, 11 insertions(+), 27 deletions(-)\r
+\r
+diff --git a/test/emacs-tree b/test/emacs-tree\r
+index 4bdfddd..8e9f37c 100755\r
+--- a/test/emacs-tree\r
++++ b/test/emacs-tree\r
+@@ -8,16 +8,14 @@ EXPECTED=$TEST_DIRECTORY/tree.expected-output\r
+ add_email_corpus\r
+ \r
+ test_begin_subtest "Basic notmuch-tree view in emacs"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (test-output)\r
+           (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
+ \r
+ test_begin_subtest "Refreshed notmuch-tree view in emacs"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (notmuch-tree-refresh-view)\r
+           (notmuch-test-wait)\r
+@@ -30,8 +28,7 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
+ # correctly.\r
+ \r
+ test_begin_subtest "Tag message in notmuch tree view (display)"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (forward-line)\r
+           (notmuch-tree-tag (list "+test_tag"))\r
+@@ -44,8 +41,7 @@ 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 tree view"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (forward-line)\r
+           (notmuch-tree-tag (list "-test_tag"))\r
+@@ -58,8 +54,7 @@ output=$(notmuch search --output=messages 'tag:test_tag')\r
+ test_expect_equal "$output" ""\r
+ \r
+ test_begin_subtest "Tag thread in notmuch tree view"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           ;; move to a sizable thread\r
+           (forward-line 26)\r
+@@ -80,8 +75,7 @@ id:87iqd9rn3l.fsf@vertex.dottedmag\r
+ id:20091117190054.GU3165@dottiness.seas.harvard.edu"\r
+ \r
+ test_begin_subtest "Untag thread in notmuch tree view"\r
+-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (notmuch-tree "tag:inbox")\r
++test_emacs '(notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           ;; move to the same sizable thread as above\r
+           (forward-line 26)\r
+@@ -147,26 +141,20 @@ cp OUTPUT /tmp/mjwout\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window\r
+ \r
+ test_begin_subtest "Stash id"\r
+-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-                   (require (quote notmuch-tree))\r
+-                   (notmuch-tree "id:1258498485-sup-142@elly")\r
++output=$(test_emacs '(notmuch-tree "id:1258498485-sup-142@elly")\r
+                    (notmuch-test-wait)\r
+                    (notmuch-show-stash-message-id)')\r
+ test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""\r
+ \r
+ test_begin_subtest "Move to next matching message"\r
+-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-                   (require (quote notmuch-tree))\r
+-                   (notmuch-tree "from:cworth")\r
++output=$(test_emacs '(notmuch-tree "from:cworth")\r
+                    (notmuch-test-wait)\r
+                    (notmuch-tree-next-matching-message)\r
+                    (notmuch-show-stash-message-id)')\r
+ test_expect_equal "$output" "\"Stashed: id:878we4qdqf.fsf@yoom.home.cworth.org\""\r
+ \r
+ test_begin_subtest "Move to next thread"\r
+-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-                   (require (quote notmuch-tree))\r
+-                   (notmuch-tree "tag:inbox")\r
++output=$(test_emacs '(notmuch-tree "tag:inbox")\r
+                    (notmuch-test-wait)\r
+                    (forward-line 26)\r
+                    (notmuch-tree-next-thread)\r
+@@ -174,9 +162,7 @@ output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ test_expect_equal "$output" "\"Stashed: id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net\""\r
+ \r
+ test_begin_subtest "Move to previous thread"\r
+-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-                   (require (quote notmuch-tree))\r
+-                   (notmuch-tree "tag:inbox")\r
++output=$(test_emacs '(notmuch-tree "tag:inbox")\r
+                    (notmuch-test-wait)\r
+                    (forward-line 26)\r
+                    (notmuch-tree-prev-thread)\r
+@@ -184,9 +170,7 @@ output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ test_expect_equal "$output" "\"Stashed: id:20091117190054.GU3165@dottiness.seas.harvard.edu\""\r
+ \r
+ test_begin_subtest "Move to previous previous thread"\r
+-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-                   (require (quote notmuch-tree))\r
+-                   (notmuch-tree "tag:inbox")\r
++output=$(test_emacs '(notmuch-tree "tag:inbox")\r
+                    (notmuch-test-wait)\r
+                    (forward-line 26)\r
+                    (notmuch-tree-prev-thread)\r
+-- \r
+1.7.9.1\r
+\r