X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT340-maildir-sync.sh;h=a697317f426ccfdb9559230071f6f8960cda5d26;hp=433effef5cc5feebf3d629d4f2cee7c11bd75524;hb=2707c06a0fc587a68096a3ec6f054ba4f0d7e7c7;hpb=f385055528a77d7cc4566de3a3605f2a6c474862

diff --git a/test/T340-maildir-sync.sh b/test/T340-maildir-sync.sh
index 433effef..a697317f 100755
--- a/test/T340-maildir-sync.sh
+++ b/test/T340-maildir-sync.sh
@@ -2,7 +2,7 @@
 
 test_description="maildir synchronization"
 
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 # Create the expected maildir structure
 mkdir $MAIL_DIR/cur
@@ -45,6 +45,7 @@ test_expect_equal "$output" "adding-replied-tag:2,RS"
 test_begin_subtest "notmuch show works with renamed file (without notmuch new)"
 output=$(notmuch show --format=json id:${gen_msg_id} | notmuch_json_show_sanitize)
 test_expect_equal_json "$output" '[[[{"id": "XXXXX",
+"crypto": {},
 "match": true,
 "excluded": false,
 "filename": ["YYYYY"],
@@ -173,7 +174,7 @@ thread:XXX   2001-01-05 [1/1(3)] Notmuch Test Suite; Duplicated message (inbox r
 test_begin_subtest "Tag changes modify flags of multiple files"
 notmuch tag -replied subject:"Duplicated message"
 (cd $MAIL_DIR/cur/; ls duplicated*) > actual
-test_expect_equal "$(< actual)"  "duplicated-message-another-copy:2,S
+test_expect_equal "$(< actual)" "duplicated-message-another-copy:2,S
 duplicated-message-copy:2,S
 duplicated-message:2,S"
 
@@ -196,26 +197,14 @@ notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output
 test_expect_equal "$(< output)" \
 "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test unread)"
 
-test_begin_subtest "unread is not mandatory in new/"
-test_subtest_known_broken
-OLDCONFIG=$(notmuch config get new.tags)
-notmuch config set new.tags test
-add_message [subject]='"File in new/"' [dir]=new [filename]='file-in-new'
-notmuch config set new.tags $OLDCONFIG
-notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output
-test_expect_equal "$(< output)" \
-"thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test)"
-
 for tag in draft flagged passed replied; do
-
     test_begin_subtest "$tag is valid in new.tags"
-    test_subtest_known_broken
     OLDCONFIG=$(notmuch config get new.tags)
-    notmuch config set new.tags "$tag"
+    notmuch config set new.tags "$tag;unread"
     add_message [subject]="\"$tag sync in new\"" [dir]=new
     notmuch config set new.tags $OLDCONFIG
     notmuch search "subject:\"$tag sync in new\"" | notmuch_search_sanitize > output
     test_expect_equal "$(< output)" \
-		      "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; $tag sync in new ($tag)"
+		      "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; $tag sync in new ($tag unread)"
 done
 test_done