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

Merge branch 'mcatanzaro/gtype-criticals' into 'main'

Browse Source 
Replace most GObject warnings with criticals

See merge request GNOME/glib!2852
This commit is contained in:
Marco Trevisan
2022-09-19 14:35:12 +00:00
parent d29e936a6c 0ffe86a1f7
commit 22f0522c10
14 changed files with 393 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/tests/binding.c
View File

@@ -843,7 +843,7 @@ binding_fail (void)
G_BINDING_DEFAULT);
g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding);
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING,
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL,
"*Unable to convert*double*boolean*");
g_object_set (source, "double-value", 1.0, NULL);
g_test_assert_expected_messages ();

2
gobject/tests/properties.c
View File

@@ -582,7 +582,7 @@ properties_testv_with_invalid_property_type (void)
}
g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT);
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*WARNING*foo*gint*gchararray*");
g_test_trap_assert_stderr ("*CRITICAL*foo*gint*gchararray*");
}

8
gobject/tests/signals.c
View File

@@ -1546,13 +1546,13 @@ test_signal_disconnect_wrong_object (void)
NULL);
/* disconnect from the wrong object (same type), should warn */
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING,
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL,
"*: instance '*' has no handler with id '*'");
g_signal_handler_disconnect (object2, signal_id);
g_test_assert_expected_messages ();
/* and from an object of the wrong type */
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING,
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL,
"*: instance '*' has no handler with id '*'");
g_signal_handler_disconnect (object3, signal_id);
g_test_assert_expected_messages ();
@@ -1586,7 +1586,7 @@ test_clear_signal_handler (void)
if (g_test_undefined ())
{
handler = g_random_int_range (0x01, 0xFF);
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
"*instance '* has no handler with id *'");
g_clear_signal_handler (&handler, test_obj);
g_assert_cmpuint (handler, ==, 0);
@@ -1642,7 +1642,7 @@ test_lookup_invalid (void)
g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT);
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*WARNING*unable to look up invalid signal name*");
g_test_trap_assert_stderr ("*CRITICAL*unable to look up invalid signal name*");
}
static void

2
gobject/tests/type-flags.c
View File

@@ -62,7 +62,7 @@ test_type_flags_final (void)
GType final2_type;
/* This is the message we print out when registering the type */
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING,
g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL,
"*cannot derive*");
/* This is the message when we fail to return from the GOnce init