From: David Bremner Date: Sat, 20 Aug 2022 18:50:05 +0000 (-0700) Subject: test: rename indexing corpus X-Git-Tag: 0.38_rc0~74 X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=a832f940e10dee79029556c002b522daadb07d74 test: rename indexing corpus The corpus is not really suitable for general indexing test since the sole message is ignored (and will most likely continue to be ignored) by notmuch-new. --- diff --git a/test/T070-insert.sh b/test/T070-insert.sh index 7d5f842d..73953272 100755 --- a/test/T070-insert.sh +++ b/test/T070-insert.sh @@ -293,7 +293,7 @@ for code in OUT_OF_MEMORY XAPIAN_EXCEPTION ; do done test_begin_subtest "insert converts mboxes on delivery" -notmuch insert +unmboxed < "${TEST_DIRECTORY}"/corpora/indexing/mbox-attachment.eml +notmuch insert +unmboxed < "${TEST_DIRECTORY}"/corpora/insert/mbox-attachment.eml output=$(notmuch count tag:unmboxed) test_expect_equal "${output}" 1 diff --git a/test/corpora/indexing/mbox-attachment.eml b/test/corpora/indexing/mbox-attachment.eml deleted file mode 100644 index 98a8fc91..00000000 --- a/test/corpora/indexing/mbox-attachment.eml +++ /dev/null @@ -1,83 +0,0 @@ -From david@tethera.net Sat Feb 5 09:19:10 2022 -From: David Bremner -To: David Bremner -Subject: Re: [RFC PATCH v2 12/12] emacs: whitespace cleanup for keybindings -Date: Sat, 05 Feb 2022 10:19:09 -0400 -Message-ID: <87k0e9o0pu.fsf@tethera.net> -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="=-=-=" - ---=-=-= -Content-Type: text/plain -Content-Disposition: inline - - -I figured out the race condition in the tests. The previous test was -still running when the failing test started, the joys of using a shared -emacs for running all of the tests in one file. - -The attached diff is split into the the commits that introduce the tests -in question in my working series, but you should be able to just apply -it on top of the posted series if you want. - - ---=-=-= -Content-Type: text/x-diff -Content-Disposition: inline; filename=0001-test-fixups.patch - -From fc88cba7f1f37b9cf3b296eace2422dd0e173502 Mon Sep 17 00:00:00 2001 -From: David Bremner -Date: Thu, 3 Feb 2022 21:05:05 -0400 -Subject: [PATCH] test fixups - ---- - test/T315-emacs-tagging.sh | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/test/T315-emacs-tagging.sh b/test/T315-emacs-tagging.sh -index c9e3e53a..c26413ce 100755 ---- a/test/T315-emacs-tagging.sh -+++ b/test/T315-emacs-tagging.sh -@@ -119,7 +119,8 @@ for mode in search show tree unthreaded; do - (notmuch-$mode \"$os_x_darwin_thread\") - (notmuch-test-wait) - (execute-kbd-macro \"+tag-to-be-undone-$mode\") -- (notmuch-tag-undo))" -+ (notmuch-tag-undo) -+ (notmuch-test-wait))" - count=$(notmuch count "tag:tag-to-be-undone-$mode") - test_expect_equal "$count" "0" - -@@ -128,9 +129,7 @@ for mode in search show tree unthreaded; do - (notmuch-$mode \"$os_x_darwin_thread\") - (notmuch-test-wait) - (execute-kbd-macro \"+one-$mode\") -- (notmuch-test-wait) - (execute-kbd-macro \"+two-$mode\") -- (notmuch-test-wait) - (notmuch-tag-undo) - (notmuch-test-wait) - (execute-kbd-macro \"+three-$mode\"))" -@@ -143,7 +142,6 @@ for mode in search show tree unthreaded; do - (notmuch-$mode \"$os_x_darwin_thread\") - (notmuch-test-wait) - (execute-kbd-macro \"+one-$mode\") -- (notmuch-test-wait) - (execute-kbd-macro \"+two-$mode\") - (notmuch-tag-undo) - (notmuch-test-wait) -@@ -159,7 +157,8 @@ for mode in search show tree unthreaded; do - (notmuch-$mode \"$os_x_darwin_thread\") - (notmuch-test-wait) - (execute-kbd-macro \"+tag-to-be-undone-$mode\") -- (execute-kbd-macro (kbd \"C-x u\")))" -+ (execute-kbd-macro (kbd \"C-x u\")) -+ (notmuch-test-wait))" - count=$(notmuch count "tag:tag-to-be-undone-$mode") - test_expect_equal "$count" "0" - done --- -2.30.2 - - ---=-=-=-- diff --git a/test/corpora/insert/mbox-attachment.eml b/test/corpora/insert/mbox-attachment.eml new file mode 100644 index 00000000..98a8fc91 --- /dev/null +++ b/test/corpora/insert/mbox-attachment.eml @@ -0,0 +1,83 @@ +From david@tethera.net Sat Feb 5 09:19:10 2022 +From: David Bremner +To: David Bremner +Subject: Re: [RFC PATCH v2 12/12] emacs: whitespace cleanup for keybindings +Date: Sat, 05 Feb 2022 10:19:09 -0400 +Message-ID: <87k0e9o0pu.fsf@tethera.net> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" + +--=-=-= +Content-Type: text/plain +Content-Disposition: inline + + +I figured out the race condition in the tests. The previous test was +still running when the failing test started, the joys of using a shared +emacs for running all of the tests in one file. + +The attached diff is split into the the commits that introduce the tests +in question in my working series, but you should be able to just apply +it on top of the posted series if you want. + + +--=-=-= +Content-Type: text/x-diff +Content-Disposition: inline; filename=0001-test-fixups.patch + +From fc88cba7f1f37b9cf3b296eace2422dd0e173502 Mon Sep 17 00:00:00 2001 +From: David Bremner +Date: Thu, 3 Feb 2022 21:05:05 -0400 +Subject: [PATCH] test fixups + +--- + test/T315-emacs-tagging.sh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/test/T315-emacs-tagging.sh b/test/T315-emacs-tagging.sh +index c9e3e53a..c26413ce 100755 +--- a/test/T315-emacs-tagging.sh ++++ b/test/T315-emacs-tagging.sh +@@ -119,7 +119,8 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+tag-to-be-undone-$mode\") +- (notmuch-tag-undo))" ++ (notmuch-tag-undo) ++ (notmuch-test-wait))" + count=$(notmuch count "tag:tag-to-be-undone-$mode") + test_expect_equal "$count" "0" + +@@ -128,9 +129,7 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+one-$mode\") +- (notmuch-test-wait) + (execute-kbd-macro \"+two-$mode\") +- (notmuch-test-wait) + (notmuch-tag-undo) + (notmuch-test-wait) + (execute-kbd-macro \"+three-$mode\"))" +@@ -143,7 +142,6 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+one-$mode\") +- (notmuch-test-wait) + (execute-kbd-macro \"+two-$mode\") + (notmuch-tag-undo) + (notmuch-test-wait) +@@ -159,7 +157,8 @@ for mode in search show tree unthreaded; do + (notmuch-$mode \"$os_x_darwin_thread\") + (notmuch-test-wait) + (execute-kbd-macro \"+tag-to-be-undone-$mode\") +- (execute-kbd-macro (kbd \"C-x u\")))" ++ (execute-kbd-macro (kbd \"C-x u\")) ++ (notmuch-test-wait))" + count=$(notmuch count "tag:tag-to-be-undone-$mode") + test_expect_equal "$count" "0" + done +-- +2.30.2 + + +--=-=-=--