[glib/wip/hadess/test-fixes: 1/2] tests: Fix incomplete failure check in socket test



commit a3ba3050fbfa47bbb0af00e1a3b83c587cfa84c5
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Dec 2 17:34:03 2019 +0100

    tests: Fix incomplete failure check in socket test
    
    For the check "if (error != NULL)" to work as expected, the
    create_server() (and create_server_full()) functions need to make
    sure to return an error for all the possible failures, but this
    might not always be the case.
    
    Catch all the failures by testing for a non-NULL return value if there
    was no error.

 gio/tests/socket.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gio/tests/socket.c b/gio/tests/socket.c
index f1651972f..48401c030 100644
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
@@ -342,6 +342,7 @@ test_ip_async (GSocketFamily family)
       g_clear_error (&error);
       return;
     }
+  g_assert_notnull (data);
 
   addr = g_socket_get_local_address (data->server, &error);
   g_assert_no_error (error);
@@ -446,9 +447,9 @@ test_ip_sync (GSocketFamily family)
   gchar buf[128];
 
   data = create_server (family, echo_server_thread, FALSE, &error);
-  if (error != NULL)
+  if (data == NULL)
     {
-      gchar *message = g_strdup_printf ("Failed to create server: %s", error->message);
+      gchar *message = g_strdup_printf ("Failed to create server: %s", error ? error->message : "unknown 
error");
       g_test_skip (message);
       g_free (message);
       g_clear_error (&error);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]