luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings: don't abort on missing schemas

Browse Source 
Give a g_critical instead.
This commit is contained in:
Ryan Lortie
2011-07-20 14:04:52 +02:00
parent 06941419e3
commit c841c2ce3f
3 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gio/tests/gsettings.c
View File

@@ -1887,6 +1887,31 @@ test_get_range (void)
g_object_unref (settings);
}
static gboolean
ignore_criticals (const gchar *log_domain,
GLogLevelFlags log_level,
const gchar *message,
gpointer user_data)
{
return (log_level & G_LOG_LEVEL_MASK) != G_LOG_LEVEL_CRITICAL;
}
static void
test_missing_schema (void)
{
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
{
GSettings *settings;
g_test_log_set_fatal_handler (ignore_criticals, NULL);
settings = g_settings_new ("schema.does.not.exist");
g_settings_get_value (settings, "some-key");
g_error ("i'm doing science and i'm still alive");
}
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*still alive*");
}
int
main (int argc, char *argv[])
{
@@ -1971,6 +1996,7 @@ main (int argc, char *argv[])
g_test_add_func ("/gsettings/list-schemas", test_list_schemas);
g_test_add_func ("/gsettings/mapped", test_get_mapped);
g_test_add_func ("/gsettings/get-range", test_get_range);
g_test_add_func ("/gsettings/missing-schema", test_missing_schema);
result = g_test_run ();