diff options
| author | David Bremner <david@tethera.net> | 2023-08-20 12:23:19 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2023-08-21 19:30:54 -0300 |
| commit | 368e0f61d5498ceae180e8349e848a4904008b0b (patch) | |
| tree | 88f8779d777ead2c9a2a4f995e7cc3cd0f551b17 | |
| parent | df45194d5ffc110d69811eecd50f744c2b8c3805 (diff) | |
test/setup: ignore blank lines in generated config
The presense of the blank lines between sections depends on the
version of glib. Strip them before comparison.
| -rwxr-xr-x | test/T040-setup.sh | 3 | ||||
| -rw-r--r-- | test/setup.expected-output/config-with-comments | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/test/T040-setup.sh b/test/T040-setup.sh index 10b29ec3..39846d34 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -21,7 +21,8 @@ baz EOF 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" # note this relies on the config state from the previous test. diff --git a/test/setup.expected-output/config-with-comments b/test/setup.expected-output/config-with-comments index d8397714..d925acea 100644 --- a/test/setup.expected-output/config-with-comments +++ b/test/setup.expected-output/config-with-comments @@ -1,7 +1,6 @@ # .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 @@ -12,7 +11,6 @@ # [database] path=/path/to/maildir - # User configuration # # 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 primary_email=test.suite@example.com other_email=another.suite@example.com - # Configuration for "notmuch new" # # The following options are supported here: @@ -49,7 +46,6 @@ other_email=another.suite@example.com # [new] tags=foo;bar; - # Search configuration # # The following option is supported here: @@ -61,7 +57,6 @@ tags=foo;bar; # [search] exclude_tags=baz - # Maildir compatibility configuration # # The following option is supported here: |