X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fmaildir-sync;h=df9351deaeb26990af3a2882cce3e366906b8b1c;hp=5984f54296bd66aa9207ecf86e246ec76475111a;hb=95dd5fe5d7e9cd8169a6e3174ea27376acd92870;hpb=0100df8edbc84d95210c369b9eb560b87c2d36be

diff --git a/test/maildir-sync b/test/maildir-sync
index 5984f542..df9351de 100755
--- a/test/maildir-sync
+++ b/test/maildir-sync
@@ -12,11 +12,6 @@ filter_show_json() {
     echo
 }
 
-cat >> "$NOTMUCH_CONFIG" <<EOF
-[maildir]
-synchronize_flags=true
-EOF
-
 # Create the expected maildir structure
 mkdir $MAIL_DIR/cur
 mkdir $MAIL_DIR/new
@@ -123,7 +118,7 @@ output+=$(notmuch search subject:"Message to lose maildir info" | notmuch_search
 test_expect_equal "$output" "No new mail. Detected 1 file rename.
 thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Message to lose maildir info (inbox)"
 
-add_message [subject]='"Non-maildir message"' [dir]=notmaildir/new [filename]='non-maildir-message'
+add_message [subject]='"Non-maildir message"' [dir]=notmaildir [filename]='non-maildir-message'
 expected=$(notmuch search --output=files subject:"Non-maildir message")
 test_expect_success "Can remove unread tag from message in non-maildir directory" 'notmuch tag -unread subject:"Non-maildir message"'
 
@@ -155,11 +150,6 @@ notmuch search subject:"Duplicated message" | notmuch_search_sanitize >> output
 test_expect_equal "$(< output)" "No new mail.
 thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Duplicated message (inbox replied)"
 
-test_begin_subtest "Duplicate mail with new flags propagates flag to original file"
-(cd $MAIL_DIR/cur/; ls duplicated*) > actual
-test_expect_equal "$(< actual)" "duplicated-message:2,RS
-duplicated-message-copy:2,RS"
-
 test_begin_subtest "Adding duplicate message without flags does not remove tags"
 cp "$MAIL_DIR/cur/duplicated-message-copy:2,RS" "$MAIL_DIR/cur/duplicated-message-another-copy:2,"
 increment_mtime $MAIL_DIR/cur