devices/test: reapply commit 5c6a382d4d

The commit was accidentally reverted during systemd code merge from
upstream.

devices/test: give more time to dad checking in test-arping

  # random seed: R02Sc708af827453d4ace33cd27ffd3d7f0b
  1..2
  # Start of arping tests
  **
  NetworkManager:ERROR:src/devices/tests/test-arping.c:95:test_arping_common: assertion failed (nm_arping_manager_check_address (manager, info->addresses[i]) == info->expected_result[i]): (1 == 0)
  ok 1 /arping/1
  PASS: src/devices/tests/test-arping 1 /arping/1
  ./tools/run-nm-test.sh: line 193:  2836 Aborted                 "${NMTST_DBUS_RUN_SESSION[@]}" "$TEST" "$@"
  # NetworkManager:ERROR:src/devices/tests/test-arping.c:95:test_arping_common: assertion failed (nm_arping_manager_check_address (manager, info->addresses[i]) == info->expected_result[i]): (1 == 0)
  ERROR: src/devices/tests/test-arping - too few tests run (expected 2, got 1)
  ERROR: src/devices/tests/test-arping - exited with status 134 (terminated by signal 6?)

Fixes: 8c0dfd7188
This commit is contained in:
Francesco Giudici 2017-12-12 18:40:31 +01:00
parent 9c77b06bbc
commit d82c7eb595

View file

@ -85,7 +85,7 @@ test_arping_common (test_fixture *fixture, TestInfo *info)
loop = g_main_loop_new (NULL, FALSE);
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 (nm_arping_manager_start_probe (manager, 250, NULL));
g_assert (nmtst_main_loop_run (loop, 2000));
for (i = 0; info->addresses[i]; i++) {