test: handle XDG_CONFIG_DIRS

Previously the test would fail in an environment where XDG_CONFIG_DIRS
was set as it takes precedence over the built in defaults. So let's just
set XDG_CONFIG_DIRS and test that feature instead.

Closes #13799
This commit is contained in:
Ludwig Nussel 2020-03-27 20:46:50 +01:00 committed by GitHub
parent 1b242e940a
commit a9fb0ef5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions

View File

@ -27,7 +27,6 @@
/* Mock override cockpitconf.c */
extern const gchar *cockpit_config_file;
extern const gchar *cockpit_config_dirs[];
static void
test_get_strings (void)
@ -134,11 +133,11 @@ test_get_strvs (void)
static void
test_load_dir (void)
{
cockpit_config_dirs[0] = SRCDIR "/src/ws/mock-config";
g_setenv("XDG_CONFIG_DIRS", "/does-not-exist:" SRCDIR "/src/ws/mock-config", 1);
cockpit_config_file = "cockpit.conf";
g_assert_cmpstr (cockpit_conf_string ("Section2", "value1"), ==, "string");
g_assert_cmpstr (cockpit_conf_get_dirs ()[0], ==, SRCDIR "/src/ws/mock-config");
g_assert_cmpstr (cockpit_conf_get_dirs ()[1], ==, SRCDIR "/src/ws/mock-config");
cockpit_conf_cleanup ();
}