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

devices/tests: improve assert for ioctl() in _test_recv_fixture_setup()

Browse source 
This assert sometimes fails during copr builds. But the way
the assert was, it was hard to see what the actual problem
was.

Restructure the assert (again) to get the errno in the
test logs.
This commit is contained in:
Thomas Haller 2021-01-14 18:22:15 +01:00
parent b2ff18692f
commit 55c5c57d1e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/devices/tests/test-lldp.c
View file

@ -819,13 +819,22 @@ _test_recv_fixture_setup(TestRecvFixture *fixture, gconstpointer user_data)
nm_utils_ifname_cpy(ifr.ifr_name, TEST_IFNAME);
r = ioctl(fd, TUNSETIFF, &ifr);
g_assert_cmpint(r, >=, 0);
if (r != 0) {
g_assert_cmpint(errno, ==, 0);
g_assert_cmpint(r, ==, 0);
}
/* Bring the interface up */
s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
g_assert(s >= 0);
ifr.ifr_flags |= IFF_UP;
g_assert(ioctl(s, SIOCSIFFLAGS, &ifr) >= 0);
r = ioctl(s, SIOCSIFFLAGS, &ifr);
if (r != 0) {
g_assert_cmpint(errno, ==, 0);
g_assert_cmpint(r, ==, 0);
}
nm_close(s);
link = nmtstp_assert_wait_for_link(NM_PLATFORM_GET, TEST_IFNAME, NM_LINK_TYPE_TUN, 100);