debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/setup: ignore blank lines in generated config

Browse source 
The presense of the blank lines between sections depends on the
version of glib. Strip them before comparison.
This commit is contained in:
David Bremner 2023-08-20 12:23:19 -03:00
parent df45194d5f
commit 368e0f61d5
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/T040-setup.sh
View file

@ -21,7 +21,8 @@ baz
EOF EOF
expected_dir=$NOTMUCH_SRCDIR/test/setup.expected-output expected_dir=$NOTMUCH_SRCDIR/test/setup.expected-output
test_expect_equal_file ${expected_dir}/config-with-comments new-notmuch-config sed '/^$/d' < new-notmuch-config > filtered-config
test_expect_equal_file ${expected_dir}/config-with-comments filtered-config
test_begin_subtest "setup consistent with config-set for single items" test_begin_subtest "setup consistent with config-set for single items"
# note this relies on the config state from the previous test. # note this relies on the config state from the previous test.

5
test/setup.expected-output/config-with-comments
View file

@ -1,7 +1,6 @@
# .notmuch-config - Configuration file for the notmuch mail system # .notmuch-config - Configuration file for the notmuch mail system
# #
# For more information about notmuch, see https://notmuchmail.org # For more information about notmuch, see https://notmuchmail.org
# Database configuration # Database configuration
# #
# The only value supported here is 'path' which should be the top-level # The only value supported here is 'path' which should be the top-level
@ -12,7 +11,6 @@
# #
[database] [database]
path=/path/to/maildir path=/path/to/maildir
# User configuration # User configuration
# #
# Here is where you can let notmuch know how you would like to be # Here is where you can let notmuch know how you would like to be
@ -32,7 +30,6 @@ path=/path/to/maildir
name=Test Suite name=Test Suite
primary_email=test.suite@example.com primary_email=test.suite@example.com
other_email=another.suite@example.com other_email=another.suite@example.com
# Configuration for "notmuch new" # Configuration for "notmuch new"
# #
# The following options are supported here: # The following options are supported here:
@ -49,7 +46,6 @@ other_email=another.suite@example.com
# #
[new] [new]
tags=foo;bar; tags=foo;bar;
# Search configuration # Search configuration
# #
# The following option is supported here: # The following option is supported here:
@ -61,7 +57,6 @@ tags=foo;bar;
# #
[search] [search]
exclude_tags=baz exclude_tags=baz
# Maildir compatibility configuration # Maildir compatibility configuration
# #
# The following option is supported here: # The following option is supported here: