From 21b943734f1911a158b7b465d11a04bb6de7f1a8 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 3 Nov 2025 15:58:37 +0100 Subject: [PATCH] test_networking: use appropriate assert helpers In all unit tests we rely on CMocka's provided assert helpers. However, test_networking.c was still on the default assert() call, which we try to avoid in favour of more appropriate helpers. Substitute them all with assert_*() from CMocka. Change-Id: Ie153b3d5bf19200f225cd09131de8583645110be Reported-by: Marc Heuse Signed-off-by: Antonio Quartulli Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1342 Message-Id: <20251103145842.22969-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34155.html Signed-off-by: Gert Doering --- tests/unit_tests/openvpn/test_networking.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/unit_tests/openvpn/test_networking.c b/tests/unit_tests/openvpn/test_networking.c index 6a2d09fad..1c9cac14d 100644 --- a/tests/unit_tests/openvpn/test_networking.c +++ b/tests/unit_tests/openvpn/test_networking.c @@ -2,7 +2,8 @@ #include "syshead.h" #include "networking.h" -#include +#include +#include static char *iface = "ovpn-dummy0"; @@ -27,7 +28,7 @@ net__iface_type(const char *name, const char *type) int ret = net_iface_type(NULL, name, ret_type); if (ret == 0) { - assert(strcmp(type, ret_type) == 0); + assert_string_equal(type, ret_type); } return ret; @@ -265,10 +266,10 @@ main(int argc, char *argv[]) /* following tests are standalone and do not print any CMD= */ case 8: - assert(net__iface_new("dummy0815", "dummy") == 0); - assert(net__iface_type("dummy0815", "dummy") == 0); - assert(net__iface_del("dummy0815") == 0); - assert(net__iface_type("dummy0815", NULL) == -ENODEV); + assert_int_equal(net__iface_new("dummy0815", "dummy"), 0); + assert_int_equal(net__iface_type("dummy0815", "dummy"), 0); + assert_int_equal(net__iface_del("dummy0815"), 0); + assert_int_equal(net__iface_type("dummy0815", NULL), -ENODEV); return 0; default: -- 2.47.3