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

shared/tests: add nmtst_main_context_iterate_until() helper

Browse source 
Like nmtst_main_context_iterate_until_assert(), but allows to
run into timeout.

(cherry picked from commit f2baa10bb8)
This commit is contained in:
Thomas Haller 2020-01-04 08:40:19 +01:00
parent 68800febf1
commit 3e41eb83f7
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1030,8 +1030,8 @@ _nmtst_main_loop_quit_on_notify (GObject *object, GParamSpec *pspec, gpointer us
} }
#define nmtst_main_loop_quit_on_notify ((GCallback) _nmtst_main_loop_quit_on_notify) #define nmtst_main_loop_quit_on_notify ((GCallback) _nmtst_main_loop_quit_on_notify)
#define nmtst_main_context_iterate_until_assert(context, timeout_msec, condition) \ #define nmtst_main_context_iterate_until(context, timeout_msec, condition) \
G_STMT_START { \ ({ \
nm_auto_destroy_and_unref_gsource GSource *_source = NULL; \ nm_auto_destroy_and_unref_gsource GSource *_source = NULL; \
GMainContext *_context = (context); \ GMainContext *_context = (context); \
gboolean _had_timeout = FALSE; \ gboolean _had_timeout = FALSE; \
@ -1044,8 +1044,17 @@ _nmtst_main_loop_quit_on_notify (GObject *object, GParamSpec *pspec, gpointer us
if (condition) \ if (condition) \
break; \ break; \
g_main_context_iteration (_context, TRUE); \ g_main_context_iteration (_context, TRUE); \
g_assert (!_had_timeout && #condition); \ if (_had_timeout) \
break; \
} \ } \
\
!_had_timeout; \
})
#define nmtst_main_context_iterate_until_assert(context, timeout_msec, condition) \
G_STMT_START { \
if (!nmtst_main_context_iterate_until (context, timeout_msec, condition)) \
g_assert (FALSE && #condition); \
} G_STMT_END } G_STMT_END
/*****************************************************************************/ /*****************************************************************************/