df/1ae000c35d6d9b42ffba198a410243acebf334

   1 Return-Path: <markwalters1009@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id B06B642116A\r
   6         for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:30 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 1.514\r
  10 X-Spam-Level: *\r
  11 X-Spam-Status: No, score=1.514 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7, URI_HEX=1.313] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id H7JTwnGyM5wB for <notmuch@notmuchmail.org>;\r
  18         Sat, 26 Oct 2013 15:02:26 -0700 (PDT)\r
  19 Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com\r
  20  [74.125.82.52])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  22  E3C75431FD9    for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:20 -0700\r
  23  (PDT)\r
  24 Received: by mail-wg0-f52.google.com with SMTP id k14so385718wgh.31\r
  25         for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 15:02:19 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  28         bh=+vltQD9SSHzx5DD4aO1EJt645EVg+mDqm/mqUOf1ME0=;\r
  29         b=GceJ7XoJu9dGE4iamDfy/H1ROnswQIxMgUjdF/SetdLHH/tQCL0tYkml7uE7q65aE6\r
  30         fMXB4DWo7PO2+TjOeN7StmEH2loB0Pr5O1KcGmiDbU7lL53/HP49jinkN52QvUS41njC\r
  31         VfxWllLPUqgjy89j+uvwBye4b3HqxB8wO6Pf/EXhFwNymKWFTc9Jjqz48CTs2Y85vJJ2\r
  32         imAeB0JzKmMMzYy+eNWLXLvmIIXBDQci+9J1hahBxIxV9PbaQ1iBXFuMwBI04ts30sgA\r
  33         XeHzGoyuonb9tIeB7oYwoWeumIr31L2QVCuN+aAezNPVcWp0a7gQrmS4hThNGkYIODD+\r
  34         s9Mg==\r
  35 X-Received: by 10.194.250.6 with SMTP id yy6mr12596831wjc.13.1382824939794;\r
  36         Sat, 26 Oct 2013 15:02:19 -0700 (PDT)\r
  37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
  38         by mx.google.com with ESMTPSA id\r
  39         ey4sm19988719wic.11.2013.10.26.15.02.18 for <multiple recipients>\r
  40         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  41         Sat, 26 Oct 2013 15:02:19 -0700 (PDT)\r
  42 From: Mark Walters <markwalters1009@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 4/4] pick: rename test emacs-pick to emacs-tree\r
  45 Date: Sat, 26 Oct 2013 23:02:08 +0100\r
  46 Message-Id: <1382824928-3771-5-git-send-email-markwalters1009@gmail.com>\r
  47 X-Mailer: git-send-email 1.7.9.1\r
  48 In-Reply-To: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com>\r
  49 References: <1382824928-3771-1-git-send-email-markwalters1009@gmail.com>\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Sat, 26 Oct 2013 22:02:31 -0000\r
  63 \r
  64 Also fixup run-tests.sh\r
  65 ---\r
  66  contrib/notmuch-pick/run-tests.sh    |    2 +-\r
  67  contrib/notmuch-pick/test/emacs-pick |  210 ----------------------------------\r
  68  contrib/notmuch-pick/test/emacs-tree |  210 ++++++++++++++++++++++++++++++++++\r
  69  3 files changed, 211 insertions(+), 211 deletions(-)\r
  70  delete mode 100755 contrib/notmuch-pick/test/emacs-pick\r
  71  create mode 100755 contrib/notmuch-pick/test/emacs-tree\r
  72 \r
  73 diff --git a/contrib/notmuch-pick/run-tests.sh b/contrib/notmuch-pick/run-tests.sh\r
  74 index 4832d72..1767949 100755\r
  75 --- a/contrib/notmuch-pick/run-tests.sh\r
  76 +++ b/contrib/notmuch-pick/run-tests.sh\r
  77 @@ -7,7 +7,7 @@ fail() {\r
  78      exit 1\r
  79  }\r
  80  \r
  81 -TESTS="emacs-pick"\r
  82 +TESTS="emacs-tree"\r
  83  TESTFILES="$TESTS tree.expected-output"\r
  84  \r
  85  export PICK_DIR="`cd \`dirname "$0"\` && pwd`"\r
  86 diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick\r
  87 deleted file mode 100755\r
  88 index 05ce85d..0000000\r
  89 --- a/contrib/notmuch-pick/test/emacs-pick\r
  90 +++ /dev/null\r
  91 @@ -1,210 +0,0 @@\r
  92 -#!/usr/bin/env bash\r
  93 -\r
  94 -test_description="emacs tree view interface"\r
  95 -. test-lib.sh\r
  96 -\r
  97 -EXPECTED=$TEST_DIRECTORY/tree.expected-output\r
  98 -\r
  99 -add_email_corpus\r
 100 -test_begin_subtest "Do we have emacs"\r
 101 -test_emacs '(insert "hello\n")\r
 102 -           (test-output)'\r
 103 -cat <<EOF >EXPECTED\r
 104 -hello\r
 105 -EOF\r
 106 -test_expect_equal_file OUTPUT EXPECTED\r
 107 -\r
 108 -test_begin_subtest "Basic notmuch-tree view in emacs"\r
 109 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 110 -           (require (quote notmuch-tree))\r
 111 -           (notmuch-tree "tag:inbox")\r
 112 -           (notmuch-test-wait)\r
 113 -           (test-output)\r
 114 -           (delete-other-windows)'\r
 115 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 116 -\r
 117 -test_begin_subtest "Refreshed notmuch-tree view in emacs"\r
 118 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 119 -           (require (quote notmuch-tree))\r
 120 -           (notmuch-tree "tag:inbox")\r
 121 -           (notmuch-test-wait)\r
 122 -           (notmuch-tree-refresh-view)\r
 123 -           (notmuch-test-wait)\r
 124 -           (test-output)\r
 125 -           (delete-other-windows)'\r
 126 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 127 -\r
 128 -# In the following tag tests we make sure the display is updated\r
 129 -# correctly and, in a separate test, that the database is updated\r
 130 -# correctly.\r
 131 -\r
 132 -test_begin_subtest "Tag message in notmuch tree view (display)"\r
 133 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 134 -           (require (quote notmuch-tree))\r
 135 -           (notmuch-tree "tag:inbox")\r
 136 -           (notmuch-test-wait)\r
 137 -           (forward-line)\r
 138 -           (notmuch-tree-tag (list "+test_tag"))\r
 139 -           (test-output)\r
 140 -           (delete-other-windows)'\r
 141 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged\r
 142 -\r
 143 -test_begin_subtest "Tag message in notmuch tree view (database)"\r
 144 -output=$(notmuch search --output=messages 'tag:test_tag')\r
 145 -test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
 146 -\r
 147 -test_begin_subtest "Untag message in notmuch tree view"\r
 148 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 149 -           (require (quote notmuch-tree))\r
 150 -           (notmuch-tree "tag:inbox")\r
 151 -           (notmuch-test-wait)\r
 152 -           (forward-line)\r
 153 -           (notmuch-tree-tag (list "-test_tag"))\r
 154 -           (test-output)\r
 155 -           (delete-other-windows)'\r
 156 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 157 -\r
 158 -test_begin_subtest "Untag message in notmuch tree view (database)"\r
 159 -output=$(notmuch search --output=messages 'tag:test_tag')\r
 160 -test_expect_equal "$output" ""\r
 161 -\r
 162 -test_begin_subtest "Tag thread in notmuch tree view"\r
 163 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 164 -           (require (quote notmuch-tree))\r
 165 -           (notmuch-tree "tag:inbox")\r
 166 -           (notmuch-test-wait)\r
 167 -           ;; move to a sizable thread\r
 168 -           (forward-line 26)\r
 169 -           (notmuch-tree-tag-thread (list "+test_thread_tag"))\r
 170 -           (test-output)\r
 171 -           (delete-other-windows)'\r
 172 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged\r
 173 -\r
 174 -test_begin_subtest "Tag message in notmuch tree view (database)"\r
 175 -output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
 176 -test_expect_equal "$output" \\r
 177 -"id:87ocn0qh6d.fsf@yoom.home.cworth.org\r
 178 -id:20091118005040.GA25380@dottiness.seas.harvard.edu\r
 179 -id:yunaayketfm.fsf@aiko.keithp.com\r
 180 -id:87fx8can9z.fsf@vertex.dottedmag\r
 181 -id:20091117203301.GV3165@dottiness.seas.harvard.edu\r
 182 -id:87iqd9rn3l.fsf@vertex.dottedmag\r
 183 -id:20091117190054.GU3165@dottiness.seas.harvard.edu"\r
 184 -\r
 185 -test_begin_subtest "Untag thread in notmuch tree view"\r
 186 -test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 187 -           (require (quote notmuch-tree))\r
 188 -           (notmuch-tree "tag:inbox")\r
 189 -           (notmuch-test-wait)\r
 190 -           ;; move to the same sizable thread as above\r
 191 -           (forward-line 26)\r
 192 -           (notmuch-tree-tag-thread (list "-test_thread_tag"))\r
 193 -           (test-output)\r
 194 -           (delete-other-windows)'\r
 195 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 196 -\r
 197 -test_begin_subtest "Untag message in notmuch tree view (database)"\r
 198 -output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
 199 -test_expect_equal "$output" ""\r
 200 -\r
 201 -test_begin_subtest "Navigation of notmuch-hello to search results"\r
 202 -test_emacs '(notmuch-hello)\r
 203 -           (goto-char (point-min))\r
 204 -           (re-search-forward "inbox")\r
 205 -           (widget-button-press (1- (point)))\r
 206 -           (notmuch-test-wait)\r
 207 -           (notmuch-tree-from-search-current-query)\r
 208 -           (notmuch-test-wait)\r
 209 -           (test-output)\r
 210 -           (delete-other-windows)'\r
 211 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 212 -\r
 213 -test_begin_subtest "Tree view of a single thread (from search)"\r
 214 -test_emacs '(notmuch-hello)\r
 215 -           (goto-char (point-min))\r
 216 -           (re-search-forward "inbox")\r
 217 -           (widget-button-press (1- (point)))\r
 218 -           (notmuch-test-wait)\r
 219 -           (notmuch-tree-from-search-thread)\r
 220 -           (notmuch-test-wait)\r
 221 -           (test-output)\r
 222 -           (delete-other-windows)'\r
 223 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread\r
 224 -\r
 225 -test_begin_subtest "Tree view of a single thread (from show)"\r
 226 -test_emacs '(notmuch-hello)\r
 227 -           (goto-char (point-min))\r
 228 -           (re-search-forward "inbox")\r
 229 -           (widget-button-press (1- (point)))\r
 230 -           (notmuch-test-wait)\r
 231 -           (notmuch-search-show-thread)\r
 232 -           (notmuch-tree-from-show-current-query)\r
 233 -           (notmuch-test-wait)\r
 234 -           (test-output)\r
 235 -           (delete-other-windows)'\r
 236 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread\r
 237 -\r
 238 -test_begin_subtest "Message window of tree view"\r
 239 -test_emacs '(notmuch-hello)\r
 240 -           (goto-char (point-min))\r
 241 -           (re-search-forward "inbox")\r
 242 -           (widget-button-press (1- (point)))\r
 243 -           (notmuch-test-wait)\r
 244 -           (notmuch-search-next-thread)\r
 245 -           (notmuch-tree-from-search-thread)\r
 246 -           (notmuch-test-wait)\r
 247 -           (select-window notmuch-tree-message-window)\r
 248 -           (test-output)\r
 249 -           (delete-other-windows)'\r
 250 -cp OUTPUT /tmp/mjwout\r
 251 -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window\r
 252 -\r
 253 -test_begin_subtest "Stash id"\r
 254 -output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 255 -                    (require (quote notmuch-tree))\r
 256 -                    (notmuch-tree "id:1258498485-sup-142@elly")\r
 257 -                    (notmuch-test-wait)\r
 258 -                    (notmuch-show-stash-message-id)')\r
 259 -test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""\r
 260 -\r
 261 -test_begin_subtest "Move to next matching message"\r
 262 -output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 263 -                    (require (quote notmuch-tree))\r
 264 -                    (notmuch-tree "from:cworth")\r
 265 -                    (notmuch-test-wait)\r
 266 -                    (notmuch-tree-next-matching-message)\r
 267 -                    (notmuch-show-stash-message-id)')\r
 268 -test_expect_equal "$output" "\"Stashed: id:878we4qdqf.fsf@yoom.home.cworth.org\""\r
 269 -\r
 270 -test_begin_subtest "Move to next thread"\r
 271 -output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 272 -                    (require (quote notmuch-tree))\r
 273 -                    (notmuch-tree "tag:inbox")\r
 274 -                    (notmuch-test-wait)\r
 275 -                    (forward-line 26)\r
 276 -                    (notmuch-tree-next-thread)\r
 277 -                    (notmuch-show-stash-message-id)')\r
 278 -test_expect_equal "$output" "\"Stashed: id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net\""\r
 279 -\r
 280 -test_begin_subtest "Move to previous thread"\r
 281 -output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 282 -                    (require (quote notmuch-tree))\r
 283 -                    (notmuch-tree "tag:inbox")\r
 284 -                    (notmuch-test-wait)\r
 285 -                    (forward-line 26)\r
 286 -                    (notmuch-tree-prev-thread)\r
 287 -                    (notmuch-show-stash-message-id)')\r
 288 -test_expect_equal "$output" "\"Stashed: id:20091117190054.GU3165@dottiness.seas.harvard.edu\""\r
 289 -\r
 290 -test_begin_subtest "Move to previous previous thread"\r
 291 -output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 292 -                    (require (quote notmuch-tree))\r
 293 -                    (notmuch-tree "tag:inbox")\r
 294 -                    (notmuch-test-wait)\r
 295 -                    (forward-line 26)\r
 296 -                    (notmuch-tree-prev-thread)\r
 297 -                    (notmuch-tree-prev-thread)\r
 298 -                    (notmuch-show-stash-message-id)')\r
 299 -test_expect_equal "$output" "\"Stashed: id:1258493565-13508-1-git-send-email-keithp@keithp.com\""\r
 300 -\r
 301 -test_done\r
 302 diff --git a/contrib/notmuch-pick/test/emacs-tree b/contrib/notmuch-pick/test/emacs-tree\r
 303 new file mode 100755\r
 304 index 0000000..05ce85d\r
 305 --- /dev/null\r
 306 +++ b/contrib/notmuch-pick/test/emacs-tree\r
 307 @@ -0,0 +1,210 @@\r
 308 +#!/usr/bin/env bash\r
 309 +\r
 310 +test_description="emacs tree view interface"\r
 311 +. test-lib.sh\r
 312 +\r
 313 +EXPECTED=$TEST_DIRECTORY/tree.expected-output\r
 314 +\r
 315 +add_email_corpus\r
 316 +test_begin_subtest "Do we have emacs"\r
 317 +test_emacs '(insert "hello\n")\r
 318 +           (test-output)'\r
 319 +cat <<EOF >EXPECTED\r
 320 +hello\r
 321 +EOF\r
 322 +test_expect_equal_file OUTPUT EXPECTED\r
 323 +\r
 324 +test_begin_subtest "Basic notmuch-tree view in emacs"\r
 325 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 326 +           (require (quote notmuch-tree))\r
 327 +           (notmuch-tree "tag:inbox")\r
 328 +           (notmuch-test-wait)\r
 329 +           (test-output)\r
 330 +           (delete-other-windows)'\r
 331 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 332 +\r
 333 +test_begin_subtest "Refreshed notmuch-tree view in emacs"\r
 334 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 335 +           (require (quote notmuch-tree))\r
 336 +           (notmuch-tree "tag:inbox")\r
 337 +           (notmuch-test-wait)\r
 338 +           (notmuch-tree-refresh-view)\r
 339 +           (notmuch-test-wait)\r
 340 +           (test-output)\r
 341 +           (delete-other-windows)'\r
 342 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 343 +\r
 344 +# In the following tag tests we make sure the display is updated\r
 345 +# correctly and, in a separate test, that the database is updated\r
 346 +# correctly.\r
 347 +\r
 348 +test_begin_subtest "Tag message in notmuch tree view (display)"\r
 349 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 350 +           (require (quote notmuch-tree))\r
 351 +           (notmuch-tree "tag:inbox")\r
 352 +           (notmuch-test-wait)\r
 353 +           (forward-line)\r
 354 +           (notmuch-tree-tag (list "+test_tag"))\r
 355 +           (test-output)\r
 356 +           (delete-other-windows)'\r
 357 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged\r
 358 +\r
 359 +test_begin_subtest "Tag message in notmuch tree view (database)"\r
 360 +output=$(notmuch search --output=messages 'tag:test_tag')\r
 361 +test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
 362 +\r
 363 +test_begin_subtest "Untag message in notmuch tree view"\r
 364 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 365 +           (require (quote notmuch-tree))\r
 366 +           (notmuch-tree "tag:inbox")\r
 367 +           (notmuch-test-wait)\r
 368 +           (forward-line)\r
 369 +           (notmuch-tree-tag (list "-test_tag"))\r
 370 +           (test-output)\r
 371 +           (delete-other-windows)'\r
 372 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 373 +\r
 374 +test_begin_subtest "Untag message in notmuch tree view (database)"\r
 375 +output=$(notmuch search --output=messages 'tag:test_tag')\r
 376 +test_expect_equal "$output" ""\r
 377 +\r
 378 +test_begin_subtest "Tag thread in notmuch tree view"\r
 379 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 380 +           (require (quote notmuch-tree))\r
 381 +           (notmuch-tree "tag:inbox")\r
 382 +           (notmuch-test-wait)\r
 383 +           ;; move to a sizable thread\r
 384 +           (forward-line 26)\r
 385 +           (notmuch-tree-tag-thread (list "+test_thread_tag"))\r
 386 +           (test-output)\r
 387 +           (delete-other-windows)'\r
 388 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged\r
 389 +\r
 390 +test_begin_subtest "Tag message in notmuch tree view (database)"\r
 391 +output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
 392 +test_expect_equal "$output" \\r
 393 +"id:87ocn0qh6d.fsf@yoom.home.cworth.org\r
 394 +id:20091118005040.GA25380@dottiness.seas.harvard.edu\r
 395 +id:yunaayketfm.fsf@aiko.keithp.com\r
 396 +id:87fx8can9z.fsf@vertex.dottedmag\r
 397 +id:20091117203301.GV3165@dottiness.seas.harvard.edu\r
 398 +id:87iqd9rn3l.fsf@vertex.dottedmag\r
 399 +id:20091117190054.GU3165@dottiness.seas.harvard.edu"\r
 400 +\r
 401 +test_begin_subtest "Untag thread in notmuch tree view"\r
 402 +test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 403 +           (require (quote notmuch-tree))\r
 404 +           (notmuch-tree "tag:inbox")\r
 405 +           (notmuch-test-wait)\r
 406 +           ;; move to the same sizable thread as above\r
 407 +           (forward-line 26)\r
 408 +           (notmuch-tree-tag-thread (list "-test_thread_tag"))\r
 409 +           (test-output)\r
 410 +           (delete-other-windows)'\r
 411 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 412 +\r
 413 +test_begin_subtest "Untag message in notmuch tree view (database)"\r
 414 +output=$(notmuch search --output=messages 'tag:test_thread_tag')\r
 415 +test_expect_equal "$output" ""\r
 416 +\r
 417 +test_begin_subtest "Navigation of notmuch-hello to search results"\r
 418 +test_emacs '(notmuch-hello)\r
 419 +           (goto-char (point-min))\r
 420 +           (re-search-forward "inbox")\r
 421 +           (widget-button-press (1- (point)))\r
 422 +           (notmuch-test-wait)\r
 423 +           (notmuch-tree-from-search-current-query)\r
 424 +           (notmuch-test-wait)\r
 425 +           (test-output)\r
 426 +           (delete-other-windows)'\r
 427 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
 428 +\r
 429 +test_begin_subtest "Tree view of a single thread (from search)"\r
 430 +test_emacs '(notmuch-hello)\r
 431 +           (goto-char (point-min))\r
 432 +           (re-search-forward "inbox")\r
 433 +           (widget-button-press (1- (point)))\r
 434 +           (notmuch-test-wait)\r
 435 +           (notmuch-tree-from-search-thread)\r
 436 +           (notmuch-test-wait)\r
 437 +           (test-output)\r
 438 +           (delete-other-windows)'\r
 439 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread\r
 440 +\r
 441 +test_begin_subtest "Tree view of a single thread (from show)"\r
 442 +test_emacs '(notmuch-hello)\r
 443 +           (goto-char (point-min))\r
 444 +           (re-search-forward "inbox")\r
 445 +           (widget-button-press (1- (point)))\r
 446 +           (notmuch-test-wait)\r
 447 +           (notmuch-search-show-thread)\r
 448 +           (notmuch-tree-from-show-current-query)\r
 449 +           (notmuch-test-wait)\r
 450 +           (test-output)\r
 451 +           (delete-other-windows)'\r
 452 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread\r
 453 +\r
 454 +test_begin_subtest "Message window of tree view"\r
 455 +test_emacs '(notmuch-hello)\r
 456 +           (goto-char (point-min))\r
 457 +           (re-search-forward "inbox")\r
 458 +           (widget-button-press (1- (point)))\r
 459 +           (notmuch-test-wait)\r
 460 +           (notmuch-search-next-thread)\r
 461 +           (notmuch-tree-from-search-thread)\r
 462 +           (notmuch-test-wait)\r
 463 +           (select-window notmuch-tree-message-window)\r
 464 +           (test-output)\r
 465 +           (delete-other-windows)'\r
 466 +cp OUTPUT /tmp/mjwout\r
 467 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window\r
 468 +\r
 469 +test_begin_subtest "Stash id"\r
 470 +output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 471 +                    (require (quote notmuch-tree))\r
 472 +                    (notmuch-tree "id:1258498485-sup-142@elly")\r
 473 +                    (notmuch-test-wait)\r
 474 +                    (notmuch-show-stash-message-id)')\r
 475 +test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""\r
 476 +\r
 477 +test_begin_subtest "Move to next matching message"\r
 478 +output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 479 +                    (require (quote notmuch-tree))\r
 480 +                    (notmuch-tree "from:cworth")\r
 481 +                    (notmuch-test-wait)\r
 482 +                    (notmuch-tree-next-matching-message)\r
 483 +                    (notmuch-show-stash-message-id)')\r
 484 +test_expect_equal "$output" "\"Stashed: id:878we4qdqf.fsf@yoom.home.cworth.org\""\r
 485 +\r
 486 +test_begin_subtest "Move to next thread"\r
 487 +output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 488 +                    (require (quote notmuch-tree))\r
 489 +                    (notmuch-tree "tag:inbox")\r
 490 +                    (notmuch-test-wait)\r
 491 +                    (forward-line 26)\r
 492 +                    (notmuch-tree-next-thread)\r
 493 +                    (notmuch-show-stash-message-id)')\r
 494 +test_expect_equal "$output" "\"Stashed: id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net\""\r
 495 +\r
 496 +test_begin_subtest "Move to previous thread"\r
 497 +output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 498 +                    (require (quote notmuch-tree))\r
 499 +                    (notmuch-tree "tag:inbox")\r
 500 +                    (notmuch-test-wait)\r
 501 +                    (forward-line 26)\r
 502 +                    (notmuch-tree-prev-thread)\r
 503 +                    (notmuch-show-stash-message-id)')\r
 504 +test_expect_equal "$output" "\"Stashed: id:20091117190054.GU3165@dottiness.seas.harvard.edu\""\r
 505 +\r
 506 +test_begin_subtest "Move to previous previous thread"\r
 507 +output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
 508 +                    (require (quote notmuch-tree))\r
 509 +                    (notmuch-tree "tag:inbox")\r
 510 +                    (notmuch-test-wait)\r
 511 +                    (forward-line 26)\r
 512 +                    (notmuch-tree-prev-thread)\r
 513 +                    (notmuch-tree-prev-thread)\r
 514 +                    (notmuch-show-stash-message-id)')\r
 515 +test_expect_equal "$output" "\"Stashed: id:1258493565-13508-1-git-send-email-keithp@keithp.com\""\r
 516 +\r
 517 +test_done\r
 518 -- \r
 519 1.7.9.1\r
 520 \r