From 9bd0d5cc817ffbba4160579090ecd7f9143a14d5 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Wed, 14 Apr 2021 14:40:09 +0100 Subject: [PATCH] Fix failure strings in tests Otherwise tests will fail due to source code change. Signed-off-by: Frediano Ziglio --- server/tests/test-codecs-parsing.c | 2 +- server/tests/test-vdagent.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/tests/test-codecs-parsing.c b/server/tests/test-codecs-parsing.c index 0037c058..9cea298d 100644 --- a/server/tests/test-codecs-parsing.c +++ b/server/tests/test-codecs-parsing.c @@ -72,7 +72,7 @@ static void codecs_bad(void) },{ NULL, G_LOG_LEVEL_CRITICAL, - "*assertion 'codecs != NULL' failed", + "*assertion 'codecs != nullptr' failed", FALSE, },{ ";:;", diff --git a/server/tests/test-vdagent.c b/server/tests/test-vdagent.c index f0178b4f..1afdf7f3 100644 --- a/server/tests/test-vdagent.c +++ b/server/tests/test-vdagent.c @@ -114,7 +114,7 @@ static void test_multiple_vmc_devices(void) g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "*spice_server_char_device_add_interface: vdagent already attached"); g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, - "*spice_server_remove_interface*: assertion 'char_device->st != NULL'*"); + "*spice_server_remove_interface*: assertion 'char_device->st != nullptr'*"); vmc_instances[0].base.sif = &vmc_interface.base; spice_server_add_interface(test->server, &vmc_instances[0].base); vmc_instances[1].base.sif = &vmc_interface.base; @@ -135,7 +135,7 @@ static void test_duplicate_removal(void) int status; g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, - "*spice_server_remove_interface*: assertion 'char_device->st != NULL'*"); + "*spice_server_remove_interface*: assertion 'char_device->st != nullptr'*"); vmc_instance.base.sif = &vmc_interface.base; spice_server_add_interface(test->server, &vmc_instance.base); status = spice_server_remove_interface(&vmc_instance.base);