Re: [PATCH] test: tree: pick remnants removed

diff --git a/cc/6df5ad082e216814aef3aee98bb13c92e1a39d b/cc/6df5ad082e216814aef3aee98bb13c92e1a39d
new file mode 100644 (file)
index 0000000..d40df80
--- /dev/null
+++ b/cc/6df5ad082e216814aef3aee98bb13c92e1a39d
@@ -0,0 +1,196 @@
+Return-Path: <tomi.ollila@iki.fi>\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 41958431FC0\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Jan 2014 06:46:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 yHBZztLek+KH for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Jan 2014 06:46:54 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8030D431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Jan 2014 06:46:54 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 3E7B81000B2;\r
+       Wed,  1 Jan 2014 16:46:48 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: tree: pick remnants removed\r
+In-Reply-To: <1387061912-24349-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1387061912-24349-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.17+13~gdfcf116 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 01 Jan 2014 16:46:48 +0200\r
+Message-ID: <m238l7pxnr.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Wed, 01 Jan 2014 14:46:59 -0000\r
+\r
+On Sun, Dec 15 2013, Mark Walters <markwalters1009@gmail.com> wrote:\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
+LGTM. tests pass.\r
+\r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+\r
+Tomi\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r