diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-11-03 15:40:15 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-06-10 21:44:41 +0200 |
| commit | e2fdbc2b7482c8a20d95b10fc8ef172606858957 (patch) | |
| tree | a647c248b812401607fd6360f5e9a1a68f8ff981 /shared/nm-test-utils-impl.c | |
| parent | 5373680df9cf85058866071f317026101050abcb (diff) | |
| parent | 650f83212eac1a185f841071b2154df9230eca70 (diff) | |
| download | NetworkManager-nm-1-18.tar.gz | |
build: merge branch 'th/workaround-glib-atomic-pointer-get'nm-1-18
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/667
(cherry picked from commit b57198a7bcde48b9b71d1fa013f97ffa93b492ca)
(cherry picked from commit 90a36d5efea9ca8c9e42fa90fc48798b9b47da16)
(cherry picked from commit dec74df55425b665d588c573a9e8315d9ccc257a)
(cherry picked from commit 3f3397abcac6fadbb053e8ca74108b0b9e2e2e91)
(cherry picked from commit 3f13d4d50f4e6b44d374634d5d68e04d3f5ad716)
(cherry picked from commit 39012584e1fc75ecf2c1f35227f6c225cce7ca8f)
Diffstat (limited to 'shared/nm-test-utils-impl.c')
| -rw-r--r-- | shared/nm-test-utils-impl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 02d7159342..9e2eea27e5 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -247,7 +247,10 @@ again_wait: g_assert (ret == info->pid); } - g_assert (!name_exists (info->bus, "org.freedesktop.NetworkManager")); + nmtst_main_context_iterate_until_assert_full (NULL, + 1000, + 80, + (!name_exists (info->bus, "org.freedesktop.NetworkManager"))); g_clear_object (&info->bus); |