Test output changes because keys are now listed in alphabetical order,
and because a missing database is no longer an error.
---
notmuch-config.c | 69 ++++++++-------------------------------------
test/T030-config.sh | 27 ++++++++----------
test/T040-setup.sh | 27 +++++++++++-------
3 files changed, 40 insertions(+), 83 deletions(-)
diff --git a/notmuch-config.c b/notmuch-config.c
index a4613227..f46e5c27 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -969,69 +969,22 @@ _notmuch_config_list_built_with ()
}
static int
-_list_db_config (notmuch_config_t *config)
+notmuch_config_command_list (notmuch_database_t *notmuch)
{
- notmuch_database_t *notmuch;
- notmuch_config_list_t *list;
-
- if (notmuch_database_open (notmuch_config_get_database_path (config),
- NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much))
- return EXIT_FAILURE;
+ notmuch_config_pairs_t *list;
- /* XXX Handle UUID mismatch? */
-
-
- if (print_status_database ("notmuch config", notmuch,
- notmuch_database_get_config_list (notmuch, "",
&list)))
- return EXIT_FAILURE;
-
- for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next
(list)) {
- printf ("%s=%s\n", notmuch_config_list_key (list),
notmuch_config_list_value (list));
+ _notmuch_config_list_built_with ();
+ for (list = notmuch_config_get_pairs (notmuch, "");
+ notmuch_config_pairs_valid (list);
+ notmuch_config_pairs_move_to_next (list)) {
+ const char *value = notmuch_config_pairs_value (list);
+ if (value)
+ printf ("%s=%s\n", notmuch_config_pairs_key (list), value);
}
- notmuch_config_list_destroy (list);
-
+ notmuch_config_pairs_destroy (list);
return EXIT_SUCCESS;
}
-static int
-notmuch_config_command_list (notmuch_config_t *config)
-{
- char **groups;
- size_t g, groups_length;
-
- groups = g_key_file_get_groups (config->key_file, &groups_length);
- if (groups == NULL)
- return 1;
-
- for (g = 0; g < groups_length; g++) {
- char **keys;
- size_t k, keys_length;
-
- keys = g_key_file_get_keys (config->key_file,
- groups[g], &keys_length, NULL);
- if (keys == NULL)
- continue;
-
- for (k = 0; k < keys_length; k++) {
- char *value;
-
- value = g_key_file_get_string (config->key_file,
- groups[g], keys[k], NULL);
- if (value != NULL) {
- printf ("%s.%s=%s\n", groups[g], keys[k], value);
- free (value);
- }
- }
-
- g_strfreev (keys);
- }
-
- g_strfreev (groups);
-
- _notmuch_config_list_built_with ();
- return _list_db_config (config);
-}
-
int
notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[])
{
@@ -1070,7 +1023,7 @@ notmuch_config_command (notmuch_config_t *config,
notmuch_database_t *notmuch, i
}
ret = notmuch_config_command_set (config, argv[1], argc - 2, argv + 2);
} else if (strcmp (argv[0], "list") == 0) {
- ret = notmuch_config_command_list (config);
+ ret = notmuch_config_command_list (notmuch);
} else {
fprintf (stderr, "Unrecognized argument for notmuch config: %s\n",
argv[0]);
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 023e97b3..d974850f 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -46,25 +46,22 @@ notmuch config set foo.nonexistent
test_expect_equal "$(notmuch config get foo.nonexistent)" ""
test_begin_subtest "List all items"
-notmuch config list > STDOUT 2> STDERR
-printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize
> OUTPUT
-
+notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT
cat <<EOF > EXPECTED
-database.path=MAIL_DIR
-user.name=Notmuch Test Suite
-user.primary_email=test_su...@notmuchmail.org
-user.other_email=test_suite_ot...@notmuchmail.org;test_su...@otherdomain.org
-new.tags=unread;inbox;
-new.ignore=
-search.exclude_tags=
-maildir.synchronize_flags=true
-foo.string=this is another string value
-foo.list=this;is another;list value;
built_with.compact=something
built_with.field_processor=something
built_with.retry_lock=something
-====
-Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory.
+database.mail_root=MAIL_DIR
+database.path=MAIL_DIR
+foo.list=this;is another;list value;
+foo.string=this is another string value
+maildir.synchronize_flags=true
+new.ignore=
+new.tags=unread;inbox;
+search.exclude_tags=
+user.name=Notmuch Test Suite
+user.other_email=test_suite_ot...@notmuchmail.org;test_su...@otherdomain.org
+user.primary_email=test_su...@notmuchmail.org
EOF
test_expect_equal_file EXPECTED OUTPUT
diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index 1223ebf7..87d386fd 100755
--- a/test/T040-setup.sh
+++ b/test/T040-setup.sh
@@ -20,18 +20,25 @@ foo bar
baz
EOF
-output=$(notmuch --config=new-notmuch-config config list |
notmuch_built_with_sanitize)
-test_expect_equal "$output" "\
+cat <<EOF > EXPECTED
+built_with.compact=something
+built_with.field_processor=something
+built_with.retry_lock=something
+database.mail_root=/path/to/maildir
database.path=/path/to/maildir
-user.name=Test Suite
-user.primary_email=test.su...@example.com
-user.other_email=another.su...@example.com;
-new.tags=foo;bar;
+maildir.synchronize_flags=true
new.ignore=
+new.tags=foo;bar;
search.exclude_tags=baz;
-maildir.synchronize_flags=true
-built_with.compact=something
-built_with.field_processor=something
-built_with.retry_lock=something"
+user.name=Test Suite
+user.other_email=another.su...@example.com;
+user.primary_email=test.su...@example.com
+EOF
+
+notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize
> OUTPUT
+
+test_expect_equal_file EXPECTED OUTPUT
+
+
test_done
--
2.30.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org
