diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
| commit | 8254edbf64d60bef0d70eee01490103148dba100 (patch) | |
| tree | 282eb053995da653ee170e910da05d9530d4ff53 /src/devices/tests | |
| parent | 857e5310d1764114da056cd2eb3d88625bb0ba81 (diff) | |
| parent | 90e8691111889a7b5f3c812f5a41f15a8a058913 (diff) | |
Update upstream source from tag 'upstream/1.9.90'
Update to upstream version '1.9.90' with Debian dir 83533c23245795edf9fe4919e4af3e78f2938519
Diffstat (limited to 'src/devices/tests')
| -rw-r--r-- | src/devices/tests/test-arping.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index 59223f11..4b4642f3 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -40,9 +40,8 @@ static void fixture_setup (test_fixture *fixture, gconstpointer user_data) { /* create veth pair. */ - nmtstp_run_command_check ("ip link add dev %s type veth peer name %s", IFACE_VETH0, IFACE_VETH1); - fixture->ifindex0 = nmtstp_assert_wait_for_link (NM_PLATFORM_GET, IFACE_VETH0, NM_LINK_TYPE_VETH, 100)->ifindex; - fixture->ifindex1 = nmtstp_assert_wait_for_link (NM_PLATFORM_GET, IFACE_VETH1, NM_LINK_TYPE_VETH, 100)->ifindex; + fixture->ifindex0 = nmtstp_link_veth_add (NM_PLATFORM_GET, -1, IFACE_VETH0, IFACE_VETH1)->ifindex; + fixture->ifindex1 = nmtstp_link_get_typed (NM_PLATFORM_GET, -1, IFACE_VETH1, NM_LINK_TYPE_VETH)->ifindex; g_assert (nm_platform_link_set_up (NM_PLATFORM_GET, fixture->ifindex0, NULL)); g_assert (nm_platform_link_set_up (NM_PLATFORM_GET, fixture->ifindex1, NULL)); @@ -87,7 +86,7 @@ test_arping_common (test_fixture *fixture, TestInfo *info) g_signal_connect (manager, NM_ARPING_MANAGER_PROBE_TERMINATED, G_CALLBACK (arping_manager_probe_terminated), loop); g_assert (nm_arping_manager_start_probe (manager, 100, NULL)); - g_assert (nmtst_main_loop_run (loop, 1000)); + g_assert (nmtst_main_loop_run (loop, 2000)); for (i = 0; info->addresses[i]; i++) { g_assert_cmpint (nm_arping_manager_check_address (manager, info->addresses[i]), |