[Spice-devel] [PATCH spice-server] tests: Use g_assert_(non)null instead of g_assert

[Victor Toso]

Hi,

On Mon, Dec 03, 2018 at 05:09:55PM +0000, Frediano Ziglio wrote:
> Just a style change, on more recent GLib would print a more
> friendly error report.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/tests/test-display-base.c | 2 +-
>  server/tests/test-listen.c       | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/server/tests/test-display-base.c b/server/tests/test-display-base.c
> index e9f6c54d..3ca85f3a 100644
> --- a/server/tests/test-display-base.c
> +++ b/server/tests/test-display-base.c
> @@ -943,7 +943,7 @@ Test* test_new(SpiceCoreInterface* core)
>          spice_server_destroy(server);
>      }
>  
> -    g_assert(test->server != NULL);
> +    g_assert_nonnull(test->server);

defined at glib 2.40 while we require 2.32

>  
>      printf("TESTER: listening on port %d (unsecure)\n", port);
>      g_test_log_set_fatal_handler(NULL, NULL);
> diff --git a/server/tests/test-listen.c b/server/tests/test-listen.c
> index d355b471..640e8f12 100644
> --- a/server/tests/test-listen.c
> +++ b/server/tests/test-listen.c
> @@ -29,6 +29,8 @@
>  #include <gio/gio.h>
>  #include <gio/gunixsocketaddress.h>
>  
> +#include "test-glib-compat.h"
> +
>  /* Arbitrary base port, we want a port which is not in use by the system, and
>   * by another of our tests (in case of parallel runs)
>   */
> @@ -189,8 +191,8 @@ static gpointer check_no_connect_thread(gpointer data)
>      GIOStream *stream;
>  
>      stream = fake_client_connect(connectable, &error);
> -    g_assert(error != NULL);
> -    g_assert(stream == NULL);
> +    g_assert_nonnull(error);
> +    g_assert_null(stream);

this is closer, defined at glib 2.38 while we require 2.32

>      g_clear_error(&error);
>  
>      g_object_unref(connectable);
> -- 
> 2.17.2
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20181204/bdd1c4cf/attachment-0001.sig>