diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-01-12 12:11:38 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-01-12 14:35:35 +0100 |
| commit | 3019c3b0c12fee7b5a46f644b59a99ee82feeea4 (patch) | |
| tree | f9ee59190ba8dc7bb87a0abb455381817036ff45 | |
| parent | b5d22ad46d0c4292424c55eaa2d162cd74646a25 (diff) | |
| download | NetworkManager-3019c3b0c12fee7b5a46f644b59a99ee82feeea4.tar.gz | |
fixup! core: add test for NMArpingManager
| -rw-r--r-- | src/devices/tests/test-arping.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index ffa1d4e734..fb883c08b8 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -49,13 +49,6 @@ fixture_setup (test_fixture *fixture, gconstpointer user_data) g_assert (nm_platform_link_set_up (NM_PLATFORM_GET, fixture->ifindex1, NULL)); } -static gboolean -loop_quit (gpointer user_data) -{ - g_main_loop_quit ((GMainLoop *) user_data); - return G_SOURCE_REMOVE; -} - typedef struct { in_addr_t addresses[8]; in_addr_t peer_addresses[8]; @@ -71,7 +64,7 @@ arping_manager_probe_terminated (NMArpingManager *arping_manager, GMainLoop *loo static void test_arping_common (test_fixture *fixture, TestInfo *info) { - NMArpingManager *manager; + gs_unref_object NMArpingManager *manager = NULL; GMainLoop *loop; int i; @@ -95,11 +88,10 @@ test_arping_common (test_fixture *fixture, TestInfo *info) G_CALLBACK (arping_manager_probe_terminated), NULL); loop = g_main_loop_new (NULL, FALSE); - g_timeout_add_seconds (1, loop_quit, loop); g_assert (nm_arping_manager_start_probe (manager, 100, loop, (GDestroyNotify) g_main_loop_unref, NULL)); - g_main_loop_run (loop); + g_assert (nmtst_main_loop_run (loop, 1000)); for (i = 0; info->addresses[i]; i++) { g_assert_cmpint (nm_arping_manager_check_address (manager, info->addresses[i]), |