This allows verification of comments added to new / updated config file. --- test/T040-setup.sh | 17 +--- .../config-with-comments | 88 +++++++++++++++++++ 2 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 test/setup.expected-output/config-with-comments diff --git a/test/T040-setup.sh b/test/T040-setup.sh index 5eb281d7..daeca3e4 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -10,7 +10,7 @@ Error: cannot load config file. Try running 'notmuch setup' to create a configuration." test_begin_subtest "Create a new config interactively" -notmuch --config=new-notmuch-config > /dev/null <<EOF +notmuch --config=new-notmuch-config > log.${test_count} <<EOF Test Suite test.suite@example.com another.suite@example.com @@ -20,19 +20,8 @@ foo bar baz EOF -output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize) -test_expect_equal "$output" "\ -database.path=/path/to/maildir -user.name=Test Suite -user.primary_email=test.suite@example.com -user.other_email=another.suite@example.com; -new.tags=foo;bar; -new.ignore= -search.exclude_tags=baz; -maildir.synchronize_flags=true -built_with.compact=something -built_with.field_processor=something -built_with.retry_lock=something" +expected_dir=$NOTMUCH_SRCDIR/test/setup.expected-output +test_expect_equal_file ${expected_dir}/config-with-comments new-notmuch-config test_begin_subtest "notmuch with a config but without a database suggests notmuch new" notmuch 2>&1 | notmuch_dir_sanitize > OUTPUT diff --git a/test/setup.expected-output/config-with-comments b/test/setup.expected-output/config-with-comments new file mode 100644 index 00000000..d9f796f2 --- /dev/null +++ b/test/setup.expected-output/config-with-comments @@ -0,0 +1,88 @@ +# .notmuch-config - Configuration file for the notmuch mail system +# +# For more information about notmuch, see https://notmuchmail.org + +# Database configuration +# +# The only value supported here is 'path' which should be the top-level +# directory where your mail currently exists and to where mail will be +# delivered in the future. Files should be individual email messages. +# Notmuch will store its database within a sub-directory of the path +# configured here named ".notmuch". +# +[database] +path=/path/to/maildir + +# User configuration +# +# Here is where you can let notmuch know how you would like to be +# addressed. Valid settings are +# +# name Your full name. +# primary_email Your primary email address. +# other_email A list (separated by ';') of other email addresses +# at which you receive email. +# +# Notmuch will use the various email addresses configured here when +# formatting replies. It will avoid including your own addresses in the +# recipient list of replies, and will set the From address based on the +# address to which the original email was addressed. +# +[user] +name=Test Suite +primary_email=test.suite@example.com +other_email=another.suite@example.com; + +# Configuration for "notmuch new" +# +# The following options are supported here: +# +# tags A list (separated by ';') of the tags that will be +# added to all messages incorporated by "notmuch new". +# +# ignore A list (separated by ';') of file and directory names +# that will not be searched for messages by "notmuch new". +# +# NOTE: *Every* file/directory that goes by one of those +# names will be ignored, independent of its depth/location +# in the mail store. +# +[new] +tags=foo;bar; +ignore= + +# Search configuration +# +# The following option is supported here: +# +# exclude_tags +# A ;-separated list of tags that will be excluded from +# search results by default. Using an excluded tag in a +# query will override that exclusion. +# +[search] +exclude_tags=baz; + +# Maildir compatibility configuration +# +# The following option is supported here: +# +# synchronize_flags Valid values are true and false. +# +# If true, then the following maildir flags (in message filenames) +# will be synchronized with the corresponding notmuch tags: +# +# Flag Tag +# ---- ------- +# D draft +# F flagged +# P passed +# R replied +# S unread (added when 'S' flag is not present) +# +# The "notmuch new" command will notice flag changes in filenames +# and update tags, while the "notmuch tag" and "notmuch restore" +# commands will notice tag changes and update flags in filenames +# +[maildir] +synchronize_flags=true -- 2.30.2 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org