Mohsin Kaleem <mohk...@kisara.moe> writes: This should mention emacs in the commit message. test/emacs: is the usual convention.
> --- > test/T461-emacs-search-exclude.sh | 99 +++++++++++++++++++ > .../notmuch-search-tag-inbox-with-excluded | 25 +++++ > .../notmuch-search-tag-inbox-without-excluded | 21 ++++ > .../notmuch-tree-tag-inbox-with-excluded | 53 ++++++++++ > .../notmuch-tree-tag-inbox-without-excluded | 49 +++++++++ > 5 files changed, 247 insertions(+) > create mode 100755 test/T461-emacs-search-exclude.sh > create mode 100644 > test/emacs-exclude.expected-output/notmuch-search-tag-inbox-with-excluded > create mode 100644 > test/emacs-exclude.expected-output/notmuch-search-tag-inbox-without-excluded > create mode 100644 > test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded > create mode 100644 > test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded > > diff --git a/test/T461-emacs-search-exclude.sh > b/test/T461-emacs-search-exclude.sh > new file mode 100755 > index 00000000..bf558847 > --- /dev/null > +++ b/test/T461-emacs-search-exclude.sh > @@ -0,0 +1,99 @@ > +#!/usr/bin/env bash > + > +test_description="exclude options persist between Emacs search and tree > modes" > +. $(dirname "$0")/test-lib.sh || exit 1 > +. $NOTMUCH_SRCDIR/test/test-lib-emacs.sh || exit 1 > + > +EXPECTED=$NOTMUCH_SRCDIR/test/emacs-exclude.expected-output > + > +test_require_emacs > +add_email_corpus > +notmuch config set search.exclude_tags deleted > +notmuch tag +deleted -- 'from:"Stewart Smith"' or 'from:"Chris Wilson"' > + > +# Basic test cases just asserting exclude option is working and consistent. > + > +test_begin_subtest "Search doesn't contain excluded mail by default" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox-without-excluded > OUTPUT > + > +test_begin_subtest "Toggling exclude in search will show excluded mail" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (notmuch-search-toggle-exclude) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox-with-excluded > OUTPUT > + > +test_begin_subtest "Tree search doesn't contain excluded mail by default" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (notmuch-tree-from-search-current-query) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-without-excluded > OUTPUT > + > +test_begin_subtest "Toggling exclude in tree search will show excluded mail" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (notmuch-tree-from-search-current-query) > + (notmuch-test-wait) > + (notmuch-tree-toggle-exclude) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-with-excluded OUTPUT > + > +# Choice of showing excluded mail persists when switching between tree and > search > +# buffers. > + > +test_begin_subtest "Value of exclude from search persists into tree search" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (notmuch-search-toggle-exclude) > + (notmuch-test-wait) > + (notmuch-tree-from-search-current-query) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-with-excluded OUTPUT > + > +test_begin_subtest "Value of exclude from tree persists into search search" > +test_emacs '(notmuch-hello) > + (goto-char (point-min)) > + (re-search-forward "inbox") > + (widget-button-press (1- (point))) > + (notmuch-test-wait) > + (notmuch-tree-from-search-current-query) > + (notmuch-test-wait) > + (notmuch-tree-toggle-exclude) > + (notmuch-test-wait) > + (notmuch-search-from-tree-current-query) > + (notmuch-test-wait) > + (test-output) > + (delete-other-windows)' > +test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox-with-excluded > OUTPUT > + > +# TODO: Add test cases for unthreaded conversions as well. > + > +test_done > diff --git > a/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-with-excluded > b/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-with-excluded > new file mode 100644 > index 00000000..ce1d7118 > --- /dev/null > +++ > b/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-with-excluded > @@ -0,0 +1,25 @@ > + 2009-11-17 [5/5] Mikhail Gusarov, Carl Worth, Keith Packard [notmuch] > [PATCH 1/2] Close message file after parsing message headers (inbox unread) > + 2009-11-17 [7/7] Lars Kellogg-Stedman, Mikhail Gusarov, Keith Packard, > Carl Worth [notmuch] Working with Maildir storage? (inbox signed unread) > + 2009-11-17 [2/2] Alex Botero-Lowry, Carl Worth [notmuch] preliminary > FreeBSD support (attachment inbox unread) > + 2009-11-17 [1/1] Mikhail Gusarov [notmuch] [PATCH] Handle rename of > message file (inbox unread) > + 2009-11-17 [2/2] Keith Packard, Carl Worth [notmuch] [PATCH] Make > notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox > unread) > + 2009-11-17 [2/2] Jan Janak, Carl Worth [notmuch] [PATCH] Older > versions of install do not support -C. (inbox unread) > + 2009-11-17 [3/3] Jan Janak, Carl Worth [notmuch] What a great > idea! (inbox unread) > + 2009-11-17 [3/3] Israel Herraiz, Keith Packard, Carl Worth [notmuch] > New to the list (inbox unread) > + 2009-11-17 [3/3] Adrian Perez de Castro, Keith Packard, Carl Worth > [notmuch] Introducing myself (inbox signed unread) > + 2009-11-17 [3/3] Aron Griffis, Keith Packard, Carl Worth [notmuch] > archive (inbox unread) > + 2009-11-17 [2/2] Ingmar Vanhassel, Carl Worth [notmuch] [PATCH] Typsos > (inbox unread) > + 2009-11-18 [2/2] Alex Botero-Lowry, Carl Worth [notmuch] [PATCH] Error > out if no query is supplied to search instead of going into an infinite loop > (attachment inbox unread) > + 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs > to stderr? (attachment inbox signed unread) > + 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] Fix linking with > gcc to use g++ to link in C++ libs. (deleted inbox unread) > + 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH 2/2] Read mail > directory in inode number order (deleted inbox unread) > + 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] count_files: > sort directory in inode order before statting (deleted inbox unread) > + 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry [notmuch] Mac > OS X/Darwin compatibility issues (inbox unread) > + 2009-11-18 [1/1] Jan Janak [notmuch] [PATCH] notmuch new: > Support for conversion of spool subdirectories into tags (inbox unread) > + 2009-11-18 [1/1] Rolland Santimano [notmuch] Link to mailing list > archives ? (inbox unread) > + 2009-11-18 [1/1] Alexander Botero-Lowry [notmuch] request for pull > (inbox unread) > + 2009-11-18 [2/2] Keith Packard, Alexander Botero-Lowry [notmuch] > [PATCH] Create a default notmuch-show-hook that highlights URLs and uses > word-wrap (inbox unread) > + 2009-11-18 [1/1] Chris Wilson [notmuch] [PATCH 1/2] Makefile: > evaluate pkg-config once (deleted inbox unread) > + 2010-12-16 [1/1] Olivier Berger Essai accentué (inbox unread) > + 2010-12-29 [1/1] François Boulogne [aur-general] Guidelines: cp, > mkdir vs install (inbox unread) > +End of search results. > diff --git > a/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-without-excluded > > b/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-without-excluded > new file mode 100644 > index 00000000..8a874320 > --- /dev/null > +++ > b/test/emacs-exclude.expected-output/notmuch-search-tag-inbox-without-excluded > @@ -0,0 +1,21 @@ > + 2009-11-17 [5/5] Mikhail Gusarov, Carl Worth, Keith Packard [notmuch] > [PATCH 1/2] Close message file after parsing message headers (inbox unread) > + 2009-11-17 [7/7] Lars Kellogg-Stedman, Mikhail Gusarov, Keith Packard, > Carl Worth [notmuch] Working with Maildir storage? (inbox signed unread) > + 2009-11-17 [2/2] Alex Botero-Lowry, Carl Worth [notmuch] preliminary > FreeBSD support (attachment inbox unread) > + 2009-11-17 [1/1] Mikhail Gusarov [notmuch] [PATCH] Handle rename of > message file (inbox unread) > + 2009-11-17 [2/2] Keith Packard, Carl Worth [notmuch] [PATCH] Make > notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox > unread) > + 2009-11-17 [2/2] Jan Janak, Carl Worth [notmuch] [PATCH] Older > versions of install do not support -C. (inbox unread) > + 2009-11-17 [3/3] Jan Janak, Carl Worth [notmuch] What a great > idea! (inbox unread) > + 2009-11-17 [3/3] Israel Herraiz, Keith Packard, Carl Worth [notmuch] > New to the list (inbox unread) > + 2009-11-17 [3/3] Adrian Perez de Castro, Keith Packard, Carl Worth > [notmuch] Introducing myself (inbox signed unread) > + 2009-11-17 [3/3] Aron Griffis, Keith Packard, Carl Worth [notmuch] > archive (inbox unread) > + 2009-11-17 [2/2] Ingmar Vanhassel, Carl Worth [notmuch] [PATCH] Typsos > (inbox unread) > + 2009-11-18 [2/2] Alex Botero-Lowry, Carl Worth [notmuch] [PATCH] Error > out if no query is supplied to search instead of going into an infinite loop > (attachment inbox unread) > + 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs > to stderr? (attachment inbox signed unread) > + 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry [notmuch] Mac > OS X/Darwin compatibility issues (inbox unread) > + 2009-11-18 [1/1] Jan Janak [notmuch] [PATCH] notmuch new: > Support for conversion of spool subdirectories into tags (inbox unread) > + 2009-11-18 [1/1] Rolland Santimano [notmuch] Link to mailing list > archives ? (inbox unread) > + 2009-11-18 [1/1] Alexander Botero-Lowry [notmuch] request for pull > (inbox unread) > + 2009-11-18 [2/2] Keith Packard, Alexander Botero-Lowry [notmuch] > [PATCH] Create a default notmuch-show-hook that highlights URLs and uses > word-wrap (inbox unread) > + 2010-12-16 [1/1] Olivier Berger Essai accentué (inbox unread) > + 2010-12-29 [1/1] François Boulogne [aur-general] Guidelines: cp, > mkdir vs install (inbox unread) > +End of search results. > diff --git > a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded > b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded > new file mode 100644 > index 00000000..5c6b2d7a > --- /dev/null > +++ b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded > @@ -0,0 +1,53 @@ > + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message > file after parsing message headers (inbox unread) > + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include > <stdint.h> to get uint32_t in C++ file with gcc 4.4 (inbox unread) > + 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message > file after parsing message headers (inbox unread) > + 2009-11-17 Keith Packard ╰┬► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir > storage? (inbox signed unread) > + 2009-11-17 Mikhail Gusarov ├┬► ... > (inbox signed unread) > + 2009-11-17 Lars Kellogg-Stedman │╰┬► ... > (inbox signed unread) > + 2009-11-17 Mikhail Gusarov │ ├─► ... > (inbox unread) > + 2009-11-17 Keith Packard │ ╰┬► ... > (inbox unread) > + 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... > (inbox signed unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support > (attachment inbox unread) > + 2009-11-17 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of > message file (inbox unread) > + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show > 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) > + 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show > 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) > + 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of > install do not support -C. (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! > (inbox unread) > + 2009-11-17 Jan Janak ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Israel Herraiz ┬►[notmuch] New to the list > (inbox unread) > + 2009-11-18 Keith Packard ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself > (inbox signed unread) > + 2009-11-18 Keith Packard ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Aron Griffis ┬►[notmuch] archive > (inbox unread) > + 2009-11-18 Keith Packard ╰┬► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no > query is supplied to search instead of going into an infinite loop > (attachment inbox unread) > + 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no > query is supplied to search instead of going into an infinite loop (inbox > unread) > + 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to > stderr? (attachment inbox signed unread) > + 2009-11-18 Lars Kellogg-Stedman ╰─► ... > (attachment inbox signed unread) > + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc > to use g++ to link in C++ libs. (deleted inbox unread) > + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail > directory in inode number order (deleted inbox unread) > + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort > directory in inode order before statting (deleted inbox unread) > + 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin > compatibility issues (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰┬► ... > (inbox unread) > + 2009-11-18 Jjgod Jiang ╰┬► ... > (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰─► ... > (inbox unread) > + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support > for conversion of spool subdirectories into tags (inbox unread) > + 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list > archives ? (inbox unread) > + 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull > (inbox unread) > + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default > notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default > notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) > + 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: > evaluate pkg-config once (deleted inbox unread) > + 2010-12-16 Olivier Berger ─►Essai accentué > (inbox unread) > + 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs > install (inbox unread) > +End of search results. > diff --git > a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded > b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded > new file mode 100644 > index 00000000..55806d18 > --- /dev/null > +++ > b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded > @@ -0,0 +1,49 @@ > + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message > file after parsing message headers (inbox unread) > + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include > <stdint.h> to get uint32_t in C++ file with gcc 4.4 (inbox unread) > + 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message > file after parsing message headers (inbox unread) > + 2009-11-17 Keith Packard ╰┬► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir > storage? (inbox signed unread) > + 2009-11-17 Mikhail Gusarov ├┬► ... > (inbox signed unread) > + 2009-11-17 Lars Kellogg-Stedman │╰┬► ... > (inbox signed unread) > + 2009-11-17 Mikhail Gusarov │ ├─► ... > (inbox unread) > + 2009-11-17 Keith Packard │ ╰┬► ... > (inbox unread) > + 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... > (inbox signed unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support > (attachment inbox unread) > + 2009-11-17 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of > message file (inbox unread) > + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show > 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) > + 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show > 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) > + 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of > install do not support -C. (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! > (inbox unread) > + 2009-11-17 Jan Janak ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Israel Herraiz ┬►[notmuch] New to the list > (inbox unread) > + 2009-11-18 Keith Packard ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself > (inbox signed unread) > + 2009-11-18 Keith Packard ├─► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Aron Griffis ┬►[notmuch] archive > (inbox unread) > + 2009-11-18 Keith Packard ╰┬► ... > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos > (inbox unread) > + 2009-11-18 Carl Worth ╰─► ... > (inbox unread) > + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no > query is supplied to search instead of going into an infinite loop > (attachment inbox unread) > + 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no > query is supplied to search instead of going into an infinite loop (inbox > unread) > + 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to > stderr? (attachment inbox signed unread) > + 2009-11-18 Lars Kellogg-Stedman ╰─► ... > (attachment inbox signed unread) > + 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin > compatibility issues (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰┬► ... > (inbox unread) > + 2009-11-18 Jjgod Jiang ╰┬► ... > (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰─► ... > (inbox unread) > + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support > for conversion of spool subdirectories into tags (inbox unread) > + 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list > archives ? (inbox unread) > + 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull > (inbox unread) > + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default > notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) > + 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default > notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) > + 2010-12-16 Olivier Berger ─►Essai accentué > (inbox unread) > + 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs > install (inbox unread) > +End of search results. > -- > 2.37.1 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
