diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-31 10:03:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-31 10:46:43 +0200 |
| commit | af9c474844fb109c49adba2653a2af9bf6423f29 (patch) | |
| tree | 6e1fc3c9107887ef2ab59ba89a7ec7c27c15d698 | |
| parent | 75f3c026ebe86628d2ea275d83df504186b38106 (diff) | |
| download | NetworkManager-af9c474844fb109c49adba2653a2af9bf6423f29.tar.gz | |
platform/tests: change nmtstp_wait_for_signal() to wait with zero timeout
The previous behavior, of treating timeout_ms as *no timeout*, makes
no sense. At least not for unit tests. If you have a really long timeout,
then set it. "0" should really mean to schedule a zero timeout.
| -rw-r--r-- | src/platform/tests/test-common.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 2abf6b2cea..85dbefdac4 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -387,8 +387,7 @@ nmtstp_wait_for_signal (NMPlatform *platform, guint timeout_ms) id_ip4_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); id_ip6_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); - if (timeout_ms != 0) - data.id = g_timeout_add (timeout_ms, _wait_for_signal_timeout, &data); + data.id = g_timeout_add (timeout_ms, _wait_for_signal_timeout, &data); g_main_loop_run (data.loop); @@ -417,7 +416,7 @@ nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms) if (until_ms < now) return 0; - signal_counts = nmtstp_wait_for_signal (platform, MAX (1, until_ms - now)); + signal_counts = nmtstp_wait_for_signal (platform, MAX (0, until_ms - now)); if (signal_counts) return signal_counts; } @@ -448,7 +447,7 @@ nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType if (until_ms < now) return NULL; - nmtstp_wait_for_signal (platform, MAX (1, until_ms - now)); + nmtstp_wait_for_signal (platform, MAX (0, until_ms - now)); } } |