git.notmuchmail.org Git - notmuch/blob - test/corpora/insert/mbox-attachment.eml

   1 From david@tethera.net  Sat Feb  5 09:19:10 2022
   2 From: David Bremner <david@tethera.net>
   3 To: David Bremner <david@tethera.net>
   4 Subject: Re: [RFC PATCH v2 12/12] emacs: whitespace cleanup for keybindings
   5 Date: Sat, 05 Feb 2022 10:19:09 -0400
   6 Message-ID: <87k0e9o0pu.fsf@tethera.net>
   7 MIME-Version: 1.0
   8 Content-Type: multipart/mixed; boundary="=-=-="
   9
  10 --=-=-=
  11 Content-Type: text/plain
  12 Content-Disposition: inline
  13
  14
  15 I figured out the race condition in the tests. The previous test was
  16 still running when the failing test started, the joys of using a shared
  17 emacs for running all of the tests in one file.
  18
  19 The attached diff is split into the the commits that introduce the tests
  20 in question in my working series, but you should be able to just apply
  21 it on top of the posted series if you want.
  22
  23
  24 --=-=-=
  25 Content-Type: text/x-diff
  26 Content-Disposition: inline; filename=0001-test-fixups.patch
  27
  28 From fc88cba7f1f37b9cf3b296eace2422dd0e173502 Mon Sep 17 00:00:00 2001
  29 From: David Bremner <david@tethera.net>
  30 Date: Thu, 3 Feb 2022 21:05:05 -0400
  31 Subject: [PATCH] test fixups
  32
  33 ---
  34  test/T315-emacs-tagging.sh | 9 ++++-----
  35  1 file changed, 4 insertions(+), 5 deletions(-)
  36
  37 diff --git a/test/T315-emacs-tagging.sh b/test/T315-emacs-tagging.sh
  38 index c9e3e53a..c26413ce 100755
  39 --- a/test/T315-emacs-tagging.sh
  40 +++ b/test/T315-emacs-tagging.sh
  41 @@ -119,7 +119,8 @@ for mode in search show tree unthreaded; do
  42        (notmuch-$mode \"$os_x_darwin_thread\")
  43        (notmuch-test-wait)
  44        (execute-kbd-macro \"+tag-to-be-undone-$mode\")
  45 -      (notmuch-tag-undo))"
  46 +      (notmuch-tag-undo)
  47 +      (notmuch-test-wait))"
  48      count=$(notmuch count "tag:tag-to-be-undone-$mode")
  49      test_expect_equal "$count" "0"
  50
  51 @@ -128,9 +129,7 @@ for mode in search show tree unthreaded; do
  52        (notmuch-$mode \"$os_x_darwin_thread\")
  53        (notmuch-test-wait)
  54        (execute-kbd-macro \"+one-$mode\")
  55 -      (notmuch-test-wait)
  56        (execute-kbd-macro \"+two-$mode\")
  57 -      (notmuch-test-wait)
  58        (notmuch-tag-undo)
  59        (notmuch-test-wait)
  60        (execute-kbd-macro \"+three-$mode\"))"
  61 @@ -143,7 +142,6 @@ for mode in search show tree unthreaded; do
  62        (notmuch-$mode \"$os_x_darwin_thread\")
  63        (notmuch-test-wait)
  64        (execute-kbd-macro \"+one-$mode\")
  65 -      (notmuch-test-wait)
  66        (execute-kbd-macro \"+two-$mode\")
  67        (notmuch-tag-undo)
  68        (notmuch-test-wait)
  69 @@ -159,7 +157,8 @@ for mode in search show tree unthreaded; do
  70        (notmuch-$mode \"$os_x_darwin_thread\")
  71        (notmuch-test-wait)
  72        (execute-kbd-macro \"+tag-to-be-undone-$mode\")
  73 -      (execute-kbd-macro (kbd \"C-x u\")))"
  74 +      (execute-kbd-macro (kbd \"C-x u\"))
  75 +      (notmuch-test-wait))"
  76      count=$(notmuch count "tag:tag-to-be-undone-$mode")
  77      test_expect_equal "$count" "0"
  78  done
  79 --
  80 2.30.2
  81
  82
  83 --=-=-=--