fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-05 04:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nmtst: convert nmtst_assert_error() to a macro to preserve func:line information

Browse source 
Within the macro, the assertion print the proper location of where
the failure happens, instead of pointing to "nm-test-utils.h".
This commit is contained in:
Thomas Haller 2016-03-04 16:46:16 +01:00
parent 0fe8a557f8
commit 2ff11525c6
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
shared/nm-test-utils.h
View file

@ -110,23 +110,24 @@
/* general purpose functions that have no dependency on other nmtst functions */
inline static void
nmtst_assert_error (GError *error,
GQuark expect_error_domain,
gint expect_error_code,
const char *expect_error_pattern)
{
if (expect_error_domain)
g_assert_error (error, expect_error_domain, expect_error_code);
else
g_assert (error);
g_assert (error->message);
if ( expect_error_pattern
&& !g_pattern_match_simple (expect_error_pattern, error->message)) {
g_error ("error message does not have expected pattern '%s'. Instead it is '%s' (%s, %d)",
expect_error_pattern, error->message, g_quark_to_string (error->domain), error->code);
}
}
#define nmtst_assert_error(error, expect_error_domain, expect_error_code, expect_error_pattern) \
G_STMT_START { \
GError *_error = (error); \
GQuark _expect_error_domain = (expect_error_domain); \
const char *_expect_error_pattern = (expect_error_pattern); \
\
if (_expect_error_domain) \
g_assert_error (_error, _expect_error_domain, (expect_error_code)); \
else \
g_assert (_error); \
g_assert (_error->message); \
if ( _expect_error_pattern \
&& !g_pattern_match_simple (_expect_error_pattern, _error->message)) { \
g_error ("%s:%d: error message does not have expected pattern '%s'. Instead it is '%s' (%s, %d)", \
__FILE__, __LINE__, \
_expect_error_pattern, _error->message, g_quark_to_string (_error->domain), _error->code); \
} \
} G_STMT_END
#define NMTST_WAIT(max_wait_ms, wait) \
({ \