diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-02-11 17:04:47 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-02-11 18:25:27 +0100 |
| commit | 861fc6854cb6398458bbeea4e878dcc9a209564c (patch) | |
| tree | 40ad3f3afe3238ef6da62bd717208d2a78b787fe | |
| parent | f0e3ca09c9d3a3196bee232307e42f008eb4baf2 (diff) | |
| download | NetworkManager-861fc6854cb6398458bbeea4e878dcc9a209564c.tar.gz | |
libnm/tests: adjust test for glib change in 2.75.0 for assertion warning
See-also: https://gitlab.gnome.org/GNOME/glib/-/commit/0ffe86a1f7e215e4561c3b9f1d03c3cd638ed00f
| -rw-r--r-- | src/libnm-core-impl/tests/test-setting.c | 10 | ||||
| -rw-r--r-- | src/libnm-glib-aux/nm-test-utils.h | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index de60afd1cb..09e0fc70ee 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -975,25 +975,25 @@ test_dcb_flags_invalid(void) s_dcb = (NMSettingDcb *) nm_setting_dcb_new(); 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); 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); 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); 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, nm_setting_dcb_get_priority_flow_control_flags, G_MAXUINT32); 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_GROUP_FLAGS, nm_setting_dcb_get_priority_group_flags, diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h index 41e1a6cedf..b65818e00a 100644 --- a/src/libnm-glib-aux/nm-test-utils.h +++ b/src/libnm-glib-aux/nm-test-utils.h @@ -846,6 +846,17 @@ nmtst_test_skip_slow(void) #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) +/* 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; |