fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 20:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: fix race in tests

Browse source 
Otherwise, we easily get a failure

    test:ERROR:src/platform/tests/test-cleanup.c:78:test_cleanup_internal: assertion failed (addresses6->len == 2): (1 == 2)

Avoid that by waiting for kernel to add the link-local
address.

(cherry picked from commit fb63d8d706)
This commit is contained in:
Thomas Haller 2018-06-20 14:11:15 +02:00
parent 4ca064043a
commit b6ff26fb2f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/platform/tests/test-cleanup.c
View file

@ -59,6 +59,22 @@ test_cleanup_internal (void)
ifindex = nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME);
g_assert (ifindex > 0);
/* wait for kernel to add the IPv6 link local address... it takes a bit. */
NMTST_WAIT_ASSERT (100, {
gs_unref_array GArray *addrs = NULL;
const NMPlatformIP6Address *a;
if (nmtst_wait_iteration > 0) {
nmtstp_wait_for_signal (NM_PLATFORM_GET, nmtst_wait_remaining_us / 1000);
nm_platform_process_events (NM_PLATFORM_GET);
}
addrs = nmtstp_platform_ip6_address_get_all (NM_PLATFORM_GET, ifindex);
if ( addrs->len == 1
&& (a = &g_array_index (addrs, NMPlatformIP6Address, 0))
&& IN6_IS_ADDR_LINKLOCAL (&a->address))
break;
});
/* Add routes and addresses */
g_assert (nm_platform_ip4_address_add (NM_PLATFORM_GET, ifindex, addr4, plen4, addr4, lifetime, preferred, 0, NULL));
g_assert (nm_platform_ip6_address_add (NM_PLATFORM_GET, ifindex, addr6, plen6, in6addr_any, lifetime, preferred, flags));