luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/hadess/test-fixes' into 'master'

Browse Source 
gio: Fix socket test

See merge request GNOME/glib!1295
This commit is contained in:
Philip Withnall 2020-01-07 16:21:20 +00:00
commit 4151dfea82
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/tests/socket.c
View File

@ -140,8 +140,12 @@ create_server_full (GSocketFamily family,
{ {
g_socket_set_option (data->server, IPPROTO_IPV6, IPV6_V6ONLY, FALSE, NULL); g_socket_set_option (data->server, IPPROTO_IPV6, IPV6_V6ONLY, FALSE, NULL);
if (!g_socket_speaks_ipv4 (data->server)) if (!g_socket_speaks_ipv4 (data->server))
{
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"IPv6-only server cannot speak IPv4");
goto error; goto error;
} }
}
#endif #endif
if (v4mapped) if (v4mapped)
@ -342,6 +346,7 @@ test_ip_async (GSocketFamily family)
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
g_assert_nonnull (data);
addr = g_socket_get_local_address (data->server, &error); addr = g_socket_get_local_address (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);