From 2265124ce39e56e407bc2620b99e736757fda265 Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Sun, 5 Feb 2012 11:13:46 +0400 Subject: [PATCH] [PATCH v5 05/12] test: fix emacs tests after tagging operations changes --- c5/c9bebbac1f47c33c87d63e1d1d8a90c3287e72 | 126 ++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 c5/c9bebbac1f47c33c87d63e1d1d8a90c3287e72 diff --git a/c5/c9bebbac1f47c33c87d63e1d1d8a90c3287e72 b/c5/c9bebbac1f47c33c87d63e1d1d8a90c3287e72 new file mode 100644 index 000000000..2fa1a056d --- /dev/null +++ b/c5/c9bebbac1f47c33c87d63e1d1d8a90c3287e72 @@ -0,0 +1,126 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 80317431FBF + for ; Sat, 4 Feb 2012 23:15:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 527XosKP588H for ; + Sat, 4 Feb 2012 23:15:29 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2EBA5431FB6 + for ; Sat, 4 Feb 2012 23:15:28 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so4650313bke.26 + for ; Sat, 04 Feb 2012 23:15:27 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; + bh=FNS6HfyjcTDEUaw1oUWiPDdu8nm5DxEtg9qwwOGRTdU=; + b=dXbfx9AhnQWM1pR4NcTTJEu6eTdIJHg5dn7GRo2drz9uiLzevnu2+GRq6NOSCPlbaT + dRYNF7WVxNiLJ17swzprJYnA4vOPjFviWdFee2EAGGSXjku/ZGrmEFCmaKmqTRSXQUdx + qZ9yPeVgq0DtzXsIK2FaWB3sbwU0Gs8fbswLU= +Received: by 10.204.151.196 with SMTP id d4mr6369735bkw.29.1328426127856; + Sat, 04 Feb 2012 23:15:27 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id d2sm32985425bky.11.2012.02.04.23.15.26 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 04 Feb 2012 23:15:27 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v5 05/12] test: fix emacs tests after tagging operations + changes +Date: Sun, 5 Feb 2012 11:13:46 +0400 +Message-Id: <1328426033-21480-6-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.9 +In-Reply-To: <1328426033-21480-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1328426033-21480-1-git-send-email-dmitry.kurochkin@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 05 Feb 2012 07:15:30 -0000 + +After the recent tagging operations changes, functions bound to "+" +and "-" in notmuch-search and notmuch-show views always read input +from the minibuffer. Use kbd macros instead of calling them directly. +--- + test/emacs | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/test/emacs b/test/emacs +index 256a738..b74cfa9 100755 +--- a/test/emacs ++++ b/test/emacs +@@ -101,26 +101,26 @@ test_begin_subtest "Add tag from search view" + os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com) + test_emacs "(notmuch-search \"$os_x_darwin_thread\") + (notmuch-test-wait) +- (notmuch-search-add-tag \"tag-from-search-view\")" ++ (execute-kbd-macro \"+tag-from-search-view\")" + output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) + 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)" + + test_begin_subtest "Remove tag from search view" + test_emacs "(notmuch-search \"$os_x_darwin_thread\") + (notmuch-test-wait) +- (notmuch-search-remove-tag \"tag-from-search-view\")" ++ (execute-kbd-macro \"-tag-from-search-view\")" + output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) + 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)" + + test_begin_subtest "Add tag from notmuch-show view" + test_emacs "(notmuch-show \"$os_x_darwin_thread\") +- (notmuch-show-add-tag \"tag-from-show-view\")" ++ (execute-kbd-macro \"+tag-from-show-view\")" + output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) + 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)" + + test_begin_subtest "Remove tag from notmuch-show view" + test_emacs "(notmuch-show \"$os_x_darwin_thread\") +- (notmuch-show-remove-tag \"tag-from-show-view\")" ++ (execute-kbd-macro \"-tag-from-show-view\")" + output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) + 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)" + +@@ -128,14 +128,14 @@ test_begin_subtest "Message with .. in Message-Id:" + add_message [id]=123..456@example '[subject]="Message with .. in Message-Id"' + test_emacs '(notmuch-search "id:\"123..456@example\"") + (notmuch-test-wait) +- (notmuch-search-add-tag "search-add") +- (notmuch-search-add-tag "search-remove") +- (notmuch-search-remove-tag "search-remove") ++ (execute-kbd-macro "+search-add") ++ (execute-kbd-macro "+search-remove") ++ (execute-kbd-macro "-search-remove") + (notmuch-show "id:\"123..456@example\"") + (notmuch-test-wait) +- (notmuch-show-add-tag "show-add") +- (notmuch-show-add-tag "show-remove") +- (notmuch-show-remove-tag "show-remove")' ++ (execute-kbd-macro "+show-add") ++ (execute-kbd-macro "+show-remove") ++ (execute-kbd-macro "-show-remove")' + output=$(notmuch search 'id:"123..456@example"' | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)" + +-- +1.7.9 + -- 2.26.2