From: Antonio Quartulli <[email protected]> Inall 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 <[email protected]> Signed-off-by: Antonio Quartulli <[email protected]> Acked-by: Frank Lichtenheld <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1342 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1342 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Frank Lichtenheld <[email protected]> diff --git a/tests/unit_tests/openvpn/test_networking.c b/tests/unit_tests/openvpn/test_networking.c index 6a2d09f..1c9cac1 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 <assert.h> +#include <setjmp.h> +#include <cmocka.h> static char *iface = "ovpn-dummy0"; @@ -27,7 +28,7 @@ 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 @@ /* 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: _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
