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

platform/tests: change nmtstp_wait_for_signal() to wait with zero timeout

Browse source 
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.
This commit is contained in:
Thomas Haller 2017-05-31 10:03:32 +02:00
parent 75f3c026eb
commit af9c474844
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/platform/tests/test-common.c
View file

@ -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));
}
}