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:24:06 +0200 |
| commit | 39012584e1fc75ecf2c1f35227f6c225cce7ca8f (patch) | |
| tree | 59c0e0352e4a4ef9ed1631be7e3c4b4e0085f47d /shared/nm-test-utils-impl.c | |
| parent | c909149c1331d661e59dcb3fd8250ca006e25ad8 (diff) | |
| parent | 8d94c7e291e36f06febd98772eca32ac939e1ab5 (diff) | |
| download | NetworkManager-nm-1-20.tar.gz | |
build: merge branch 'th/workaround-glib-atomic-pointer-get'nm-1-20
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)
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 eca037ba98..fbf62d5ffe 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -219,7 +219,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); |