[PATCH 4/6] test: fix emacs tests after tagging operations changes

diff --git a/73/57463d40614c9b35bcf60cd8f672a534bc38d6 b/73/57463d40614c9b35bcf60cd8f672a534bc38d6
new file mode 100644 (file)
index 0000000..ec519d1
--- /dev/null
+++ b/73/57463d40614c9b35bcf60cd8f672a534bc38d6
@@ -0,0 +1,124 @@
+Return-Path: <dmitry.kurochkin@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 03B43431FC7\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:51 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 H-H+X8RPTvEY for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jan 2012 20:42:48 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 58C72431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:38 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id zt19so2255515bkb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:38 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=S9ZZJ8HkmcVceIZY41Z7DYkAuQcPrhWDkTitJy8lCuI=;\r
+       b=wK+2JTXOrm7IJPBl4BXCtFAeHpLhVaOoKDTPQ8tfmI1EQClASzaB40/3FFDesWHrAW\r
+       8jnWpDbcyJLdkDG/AE8ox1DJjuRX6JfnkkngyqC+eGfH3NMnZxKJjKKYRf3XvmqETHc2\r
+       vf2kPEmVOvuEpLHaQr1dsFdQcEbL/6bYyBD9M=\r
+Received: by 10.204.145.82 with SMTP id c18mr4242896bkv.121.1327725758070;\r
+       Fri, 27 Jan 2012 20:42:38 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id ez5sm20630155bkc.15.2012.01.27.20.42.37\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 27 Jan 2012 20:42:37 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/6] test: fix emacs tests after tagging operations changes\r
+Date: Sat, 28 Jan 2012 08:41:22 +0400\r
+Message-Id: <1327725684-5887-4-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@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, 28 Jan 2012 04:42:51 -0000\r
+\r
+After the recent tagging operations changes, functions bound to "+"\r
+and "-" in notmuch-search and notmuch-show views always read input\r
+from the minibuffer.  Use kbd macros instead of calling them directly.\r
+---\r
+ test/emacs |   20 ++++++++++----------\r
+ 1 files changed, 10 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 8ca4c8a..b9c0e02 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -101,26 +101,26 @@ test_begin_subtest "Add tag from search view"\r
+ os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com)\r
+ test_emacs "(notmuch-search \"$os_x_darwin_thread\")\r
+           (notmuch-test-wait)\r
+-          (notmuch-search-add-tag \"tag-from-search-view\")"\r
++          (execute-kbd-macro \"+tag-from-search-view\")"\r
+ output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)"\r
+ \r
+ test_begin_subtest "Remove tag from search view"\r
+ test_emacs "(notmuch-search \"$os_x_darwin_thread\")\r
+           (notmuch-test-wait)\r
+-          (notmuch-search-remove-tag \"tag-from-search-view\")"\r
++          (execute-kbd-macro \"-tag-from-search-view\")"\r
+ output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"\r
+ \r
+ test_begin_subtest "Add tag from notmuch-show view"\r
+ test_emacs "(notmuch-show \"$os_x_darwin_thread\")\r
+-          (notmuch-show-add-tag \"tag-from-show-view\")"\r
++          (execute-kbd-macro \"+tag-from-show-view\")"\r
+ output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)"\r
+ \r
+ test_begin_subtest "Remove tag from notmuch-show view"\r
+ test_emacs "(notmuch-show \"$os_x_darwin_thread\")\r
+-          (notmuch-show-remove-tag \"tag-from-show-view\")"\r
++          (execute-kbd-macro \"-tag-from-show-view\")"\r
+ output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"\r
+ \r
+@@ -128,14 +128,14 @@ test_begin_subtest "Message with .. in Message-Id:"\r
+ add_message [id]=123..456@example '[subject]="Message with .. in Message-Id"'\r
+ test_emacs '(notmuch-search "id:\"123..456@example\"")\r
+           (notmuch-test-wait)\r
+-          (notmuch-search-add-tag "search-add")\r
+-          (notmuch-search-add-tag "search-remove")\r
+-          (notmuch-search-remove-tag "search-remove")\r
++          (execute-kbd-macro "+search-add")\r
++          (execute-kbd-macro "+search-remove")\r
++          (execute-kbd-macro "-search-remove")\r
+           (notmuch-show "id:\"123..456@example\"")\r
+           (notmuch-test-wait)\r
+-          (notmuch-show-add-tag "show-add")\r
+-          (notmuch-show-add-tag "show-remove")\r
+-          (notmuch-show-remove-tag "show-remove")'\r
++          (execute-kbd-macro "+show-add")\r
++          (execute-kbd-macro "+show-remove")\r
++          (execute-kbd-macro "-show-remove")'\r
+ output=$(notmuch search 'id:"123..456@example"' | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)"\r
+ \r
+-- \r
+1.7.8.3\r
+\r