gio/tests/socket: add some missing g_assert_no_error()s

[platform/upstream/glib.git] / gio / tests / socket.c

diff --git a/gio/tests/socket.c b/gio/tests/socket.c
index 362a1f2..f4c23f8 100644 (file)
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
@@ -275,6 +275,7 @@ test_ip_async (GSocketFamily family)
 
   data = create_server (family, echo_server_thread, FALSE);
   addr = g_socket_get_local_address (data->server, &error);
+  g_assert_no_error (error);
 
   client = g_socket_new (family,
                         G_SOCKET_TYPE_STREAM,
@@ -361,6 +362,7 @@ test_ip_sync (GSocketFamily family)
 
   data = create_server (family, echo_server_thread, FALSE);
   addr = g_socket_get_local_address (data->server, &error);
+  g_assert_no_error (error);
 
   client = g_socket_new (family,
                         G_SOCKET_TYPE_STREAM,
@@ -468,6 +470,7 @@ test_close_graceful (void)
 
   data = create_server (family, graceful_server_thread, FALSE);
   addr = g_socket_get_local_address (data->server, &error);
+  g_assert_no_error (error);
 
   client = g_socket_new (family,
                         G_SOCKET_TYPE_STREAM,
@@ -584,6 +587,7 @@ test_ipv6_v4mapped (void)
   g_socket_set_timeout (client, 1);
 
   addr = g_socket_get_local_address (data->server, &error);
+  g_assert_no_error (error);
   iaddr = g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4);
   v4addr = g_inet_socket_address_new (iaddr, g_inet_socket_address_get_port (G_INET_SOCKET_ADDRESS (addr)));
   g_object_unref (iaddr);
@@ -620,6 +624,7 @@ test_timed_wait (void)
 
   data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE);
   addr = g_socket_get_local_address (data->server, &error);
+  g_assert_no_error (error);
 
   client = g_socket_new (G_SOCKET_FAMILY_IPV4,
                         G_SOCKET_TYPE_STREAM,
@@ -872,6 +877,7 @@ test_reuse_tcp (void)
   g_assert_no_error (error);
   g_socket_bind (sock2, addr, TRUE, &error);
   g_assert_error (error, G_IO_ERROR, G_IO_ERROR_ADDRESS_IN_USE);
+  g_clear_error (&error);
   g_object_unref (addr);
 
   g_object_unref (sock1);
@@ -1053,18 +1059,24 @@ main (int   argc,
       char *argv[])
 {
   GSocket *sock;
+  GError *error = NULL;
 
   g_test_init (&argc, &argv, NULL);
 
   sock = g_socket_new (G_SOCKET_FAMILY_IPV6,
                        G_SOCKET_TYPE_STREAM,
                        G_SOCKET_PROTOCOL_DEFAULT,
-                       NULL);
+                       &error);
   if (sock != NULL)
     {
       ipv6_supported = TRUE;
       g_object_unref (sock);
     }
+  else
+    {
+      g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED);
+      g_clear_error (&error);
+    }
 
   g_test_add_func ("/socket/ipv4_sync", test_ipv4_sync);
   g_test_add_func ("/socket/ipv4_async", test_ipv4_async);