fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 09:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/tests: adjust test for glib change in 2.75.0 for assertion warning

Browse source 
See-also: 0ffe86a1f7
(cherry picked from commit 861fc6854c)
(cherry picked from commit c5917b0a50)
(cherry picked from commit 66d1039520)
This commit is contained in:
Thomas Haller 2023-02-11 17:04:47 +01:00
parent a8f8ca01fd
commit fcf2e40f5f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libnm-core-impl/tests/test-setting.c
View file

@ -975,25 +975,25 @@ test_dcb_flags_invalid(void)
s_dcb = (NMSettingDcb *) nm_setting_dcb_new(); s_dcb = (NMSettingDcb *) nm_setting_dcb_new();
g_assert(s_dcb); g_assert(s_dcb);
NMTST_EXPECT("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); NMTST_EXPECT("GLib-GObject", NMTST_EXPECT_GOBJECT_ASSERT_LEVEL, "*invalid or out of range*");
TEST_FLAG(NM_SETTING_DCB_APP_FCOE_FLAGS, nm_setting_dcb_get_app_fcoe_flags, 0x332523); TEST_FLAG(NM_SETTING_DCB_APP_FCOE_FLAGS, nm_setting_dcb_get_app_fcoe_flags, 0x332523);
g_test_assert_expected_messages(); g_test_assert_expected_messages();
NMTST_EXPECT("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); NMTST_EXPECT("GLib-GObject", NMTST_EXPECT_GOBJECT_ASSERT_LEVEL, "*invalid or out of range*");
TEST_FLAG(NM_SETTING_DCB_APP_ISCSI_FLAGS, nm_setting_dcb_get_app_iscsi_flags, 0xFF); TEST_FLAG(NM_SETTING_DCB_APP_ISCSI_FLAGS, nm_setting_dcb_get_app_iscsi_flags, 0xFF);
g_test_assert_expected_messages(); g_test_assert_expected_messages();
NMTST_EXPECT("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); NMTST_EXPECT("GLib-GObject", NMTST_EXPECT_GOBJECT_ASSERT_LEVEL, "*invalid or out of range*");
TEST_FLAG(NM_SETTING_DCB_APP_FIP_FLAGS, nm_setting_dcb_get_app_fip_flags, 0x1111); TEST_FLAG(NM_SETTING_DCB_APP_FIP_FLAGS, nm_setting_dcb_get_app_fip_flags, 0x1111);
g_test_assert_expected_messages(); g_test_assert_expected_messages();
NMTST_EXPECT("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); NMTST_EXPECT("GLib-GObject", NMTST_EXPECT_GOBJECT_ASSERT_LEVEL, "*invalid or out of range*");
TEST_FLAG(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, TEST_FLAG(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS,
nm_setting_dcb_get_priority_flow_control_flags, nm_setting_dcb_get_priority_flow_control_flags,
G_MAXUINT32); G_MAXUINT32);
g_test_assert_expected_messages(); g_test_assert_expected_messages();
NMTST_EXPECT("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); NMTST_EXPECT("GLib-GObject", NMTST_EXPECT_GOBJECT_ASSERT_LEVEL, "*invalid or out of range*");
TEST_FLAG( TEST_FLAG(
NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, NM_SETTING_DCB_PRIORITY_GROUP_FLAGS,
nm_setting_dcb_get_priority_group_flags, nm_setting_dcb_get_priority_group_flags,

11
src/libnm-glib-aux/nm-test-utils.h
View file

@ -766,6 +766,17 @@ nmtst_test_skip_slow(void)
#define NMTST_EXPECT_LIBNM_WARNING(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_WARNING, msg) #define NMTST_EXPECT_LIBNM_WARNING(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_WARNING, msg)
#define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_CRITICAL, msg) #define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_CRITICAL, msg)
/* Commit [1] changed the level in which glib emits certain assertions.
* As we have test that check for those assertions (g_test_expect_message()),
* we need to choose the right one.
*
* [1] https://gitlab.gnome.org/GNOME/glib/-/commit/0ffe86a1f7e215e4561c3b9f1d03c3cd638ed00f */
#if GLIB_CHECK_VERSION(2, 75, 0)
#define NMTST_EXPECT_GOBJECT_ASSERT_LEVEL G_LOG_LEVEL_CRITICAL
#else
#define NMTST_EXPECT_GOBJECT_ASSERT_LEVEL G_LOG_LEVEL_WARNING
#endif
/*****************************************************************************/ /*****************************************************************************/
typedef struct _NmtstTestData NmtstTestData; typedef struct _NmtstTestData NmtstTestData;