diff options
author | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2022-09-26 16:28:10 +0300 |
---|---|---|
committer | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2022-09-26 16:28:10 +0300 |
commit | 1499bfe483be10e505b83f6900e9d9b087cec3bd (patch) | |
tree | 446a8c376e3622112ee361e79f8f521f9c330b22 /tests | |
parent | b5ed8f5d0d3ace3df9414ad4f0b1a87829cbd111 (diff) | |
parent | 23cc41e6c10fe785a8ee6b4b296bfb8a93a46cf4 (diff) |
.......... [DEV-2142] update from branch 'master' of ssh://git.zabbix.com:7999/zbx/zabbix into feature/DEV-2142-6.3-3
Diffstat (limited to 'tests')
24 files changed, 100 insertions, 100 deletions
diff --git a/tests/libs/zbxcommon/replace_key_params_dyn.c b/tests/libs/zbxcommon/replace_key_params_dyn.c index 0ceecea51df..b3ce1b41d18 100644 --- a/tests/libs/zbxcommon/replace_key_params_dyn.c +++ b/tests/libs/zbxcommon/replace_key_params_dyn.c @@ -43,9 +43,9 @@ static int replace_key_param_cb(const char *data, int key_type, int level, int n *param = zbx_strdup(NULL, data); - unquote_key_param(*param); + zbx_unquote_key_param(*param); - if (FAIL == (ret = quote_key_param(param, quoted))) + if (FAIL == (ret = zbx_quote_key_param(param, quoted))) zbx_free(*param); return ret; diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am index 2320edf478b..dd66bb3912d 100644 --- a/tests/libs/zbxsysinfo/Makefile.am +++ b/tests/libs/zbxsysinfo/Makefile.am @@ -10,8 +10,8 @@ endif if AGENT AGENT_tests = \ - process \ - process_http \ + zbx_execute_agent_check \ + zbx_execute_agent_check_http \ check_key_access_rules endif @@ -183,15 +183,15 @@ COMMON_LIB_FILES = \ $(top_srcdir)/tests/libzbxmocktest.a \ $(top_srcdir)/tests/libzbxmockdata.a -process_SOURCES = \ - process.c \ +zbx_execute_agent_check_SOURCES = \ + zbx_execute_agent_check.c \ ../../zbxmocktest.h -process_LDADD = $(COMMON_LIB_FILES) \ +zbx_execute_agent_check_LDADD = $(COMMON_LIB_FILES) \ $(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \ $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a -process_WRAP_FUNCS = \ +zbx_execute_agent_check_WRAP_FUNCS = \ -Wl,--wrap=SYSTEM_LOCALTIME \ -Wl,--wrap=VFS_FILE_SIZE \ -Wl,--wrap=VFS_FILE_TIME \ @@ -206,30 +206,30 @@ process_WRAP_FUNCS = \ -Wl,--wrap=NET_TCP_PORT \ -Wl,--wrap=SYSTEM_USERS_NUM -process_LDADD += @AGENT_LIBS@ +zbx_execute_agent_check_LDADD += @AGENT_LIBS@ -process_LDFLAGS = @AGENT_LDFLAGS@ $(process_WRAP_FUNCS) +zbx_execute_agent_check_LDFLAGS = @AGENT_LDFLAGS@ $(zbx_execute_agent_check_WRAP_FUNCS) -process_CFLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests +zbx_execute_agent_check_CFLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests -# process_http +# zbx_execute_agent_check_http -process_http_SOURCES = \ - process_http.c \ +zbx_execute_agent_check_http_SOURCES = \ + zbx_execute_agent_check_http.c \ ../../zbxmocktest.h -process_http_LDADD = $(COMMON_LIB_FILES) +zbx_execute_agent_check_http_LDADD = $(COMMON_LIB_FILES) -process_http_WRAP_FUNCS = \ +zbx_execute_agent_check_http_WRAP_FUNCS = \ -Wl,--wrap=WEB_PAGE_GET \ -Wl,--wrap=WEB_PAGE_PERF \ -Wl,--wrap=WEB_PAGE_REGEXP -process_http_LDADD += @AGENT_LIBS@ +zbx_execute_agent_check_http_LDADD += @AGENT_LIBS@ -process_http_LDFLAGS = @AGENT_LDFLAGS@ +zbx_execute_agent_check_http_LDFLAGS = @AGENT_LDFLAGS@ -process_http_CFLAGS = $(process_http_WRAP_FUNCS) -I@top_srcdir@/tests +zbx_execute_agent_check_http_CFLAGS = $(zbx_execute_agent_check_http_WRAP_FUNCS) -I@top_srcdir@/tests # check_key_access_rules diff --git a/tests/libs/zbxsysinfo/check_key_access_rules.c b/tests/libs/zbxsysinfo/check_key_access_rules.c index 66256f29cf0..bde43ef6013 100644 --- a/tests/libs/zbxsysinfo/check_key_access_rules.c +++ b/tests/libs/zbxsysinfo/check_key_access_rules.c @@ -52,21 +52,21 @@ void zbx_mock_test_entry(void **state) ZBX_UNUSED(state); hrules = zbx_mock_get_parameter_handle("in.rules"); - init_key_access_rules(); + zbx_init_key_access_rules(); while (ZBX_MOCK_SUCCESS == zbx_mock_vector_element(hrules, &hrule)) { type = zbx_mock_get_object_member_string(hrule, "type"); pattern = zbx_mock_get_object_member_string(hrule, "pattern"); - if (SUCCEED != add_key_access_rule("key", (char *)pattern, zbx_mock_str_to_key_access_type(type))) + if (SUCCEED != zbx_add_key_access_rule("key", (char *)pattern, zbx_mock_str_to_key_access_type(type))) { - free_key_access_rules(); + zbx_free_key_access_rules(); fail_msg("Bad key access rule definition"); } } - finalize_key_access_rules_configuration(); + zbx_finalize_key_access_rules_configuration(); if (ZBX_MOCK_NO_EXIT_CODE != (error = zbx_mock_exit_code(&exit_code))) { @@ -90,7 +90,7 @@ void zbx_mock_test_entry(void **state) key = zbx_mock_get_object_member_string(hmetric, "metric"); expected_ret = zbx_mock_str_to_key_access_type(zbx_mock_get_object_member_string(hmetric, "result")); - actual_ret = check_key_access_rules(key); + actual_ret = zbx_check_key_access_rules(key); if (expected_ret != actual_ret) fail_msg("Unexpected result for metric \"%s\": %s, expected %s", key, @@ -98,5 +98,5 @@ void zbx_mock_test_entry(void **state) expected_ret == ZBX_KEY_ACCESS_ALLOW ? "Allow" : "Deny"); } - free_key_access_rules(); + zbx_free_key_access_rules(); } diff --git a/tests/libs/zbxsysinfo/check_service_test.c b/tests/libs/zbxsysinfo/check_service_test.c index 8f7c572c22f..2b46b122baa 100644 --- a/tests/libs/zbxsysinfo/check_service_test.c +++ b/tests/libs/zbxsysinfo/check_service_test.c @@ -52,8 +52,8 @@ void zbx_mock_test_entry(void **state) default_addr = zbx_mock_get_parameter_string("in.interface"); ip = zbx_mock_get_parameter_string("in.ip"); - init_result(&result); - init_request(&request); + zbx_init_agent_result(&result); + zbx_init_agent_request(&request); *key = '\0'; strcat(key, "net.tcp.service[smtp"); @@ -64,7 +64,7 @@ void zbx_mock_test_entry(void **state) } strcat(key, "]"); - parse_item_key(key, &request); + zbx_parse_item_key(key, &request); returned_code = check_service(&request, default_addr, &result, 0); if (SUCCEED != returned_code && NULL != result.msg && '\0' != *(result.msg)) @@ -72,6 +72,6 @@ void zbx_mock_test_entry(void **state) zbx_mock_assert_result_eq("Return value", expected_code, returned_code); - free_result(&result); - free_request(&request); + zbx_free_agent_result(&result); + zbx_free_agent_request(&request); } diff --git a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c index 4fb17ad195e..e6c6aa5729f 100644 --- a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c +++ b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c @@ -140,10 +140,10 @@ void zbx_mock_test_entry(void **state) zbx_mock_error_string(error)); } - init_request(&request); - init_result(¶m_result); + zbx_init_agent_request(&request); + zbx_init_agent_result(¶m_result); - if (SUCCEED != parse_item_key(key_string, &request)) + if (SUCCEED != zbx_parse_item_key(key_string, &request)) fail_msg("Cannot parse item key from string '%s'", key_string); if (0 != strcmp(request.key, "system.localtime")) @@ -166,8 +166,8 @@ void zbx_mock_test_entry(void **state) expected_value_string); } - free_request(&request); - free_result(¶m_result); + zbx_free_agent_request(&request); + zbx_free_agent_result(¶m_result); } time_t __wrap_time(time_t *seconds) diff --git a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c b/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c index fd057ceb9f5..ecb26349892 100644 --- a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c +++ b/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c @@ -39,10 +39,10 @@ void zbx_mock_test_entry(void **state) key = zbx_mock_get_parameter_string("in.key"); expected_ret = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.result")); - init_request(&request); - init_result(&result); + zbx_init_agent_request(&request); + zbx_init_agent_result(&result); - if (SUCCEED != parse_item_key(key, &request)) + if (SUCCEED != zbx_parse_item_key(key, &request)) fail_msg("Cannot parse item key: %s", key); ret = VFS_FILE_EXISTS(&request, &result); @@ -59,6 +59,6 @@ void zbx_mock_test_entry(void **state) zbx_mock_get_parameter_string("out.error"), result.msg); } - free_result(&result); - free_request(&request); + zbx_free_agent_result(&result); + zbx_free_agent_request(&request); } diff --git a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c b/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c index 7be5cfd512b..981f1d6efa9 100644 --- a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c +++ b/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c @@ -73,11 +73,11 @@ void zbx_mock_test_entry(void **state) expected_result = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.return")); - init_request(&request); - init_result(¶m_result); + zbx_init_agent_request(&request); + zbx_init_agent_result(¶m_result); init_param = zbx_mock_get_parameter_string("in.key"); - if (SUCCEED != parse_item_key(init_param, &request)) + if (SUCCEED != zbx_parse_item_key(init_param, &request)) fail_msg("Cannot parse item key: %s", init_param); if (expected_result != (actual_result = WEB_PAGE_GET(&request, ¶m_result))) @@ -108,8 +108,8 @@ void zbx_mock_test_entry(void **state) if (0 != strcmp(buffer, rvalue)) fail_msg("Got '%s' instead of '%s' as a value.", rvalue, buffer); - free_request(&request); - free_result(¶m_result); + zbx_free_agent_request(&request); + zbx_free_agent_result(¶m_result); } #ifdef HAVE_LIBCURL diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c index 6d4ea6bf797..e1f75cacd16 100644 --- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c +++ b/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c @@ -63,8 +63,8 @@ void zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func) fail_msg("Cannot get expected numeric parameter from test case data: %s", expected_param_value_string); } - init_request(&request); - init_result(¶m_result); + zbx_init_agent_request(&request); + zbx_init_agent_result(¶m_result); if (ZABBIX_MOCK_KERNEL_MAXPROC == kernel_func) actual_result = KERNEL_MAXPROC(&request, ¶m_result); @@ -103,6 +103,6 @@ void zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func) } } - free_request(&request); - free_result(¶m_result); + zbx_free_agent_request(&request); + zbx_free_agent_result(¶m_result); } diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c index 0158c106fd1..4c4570d8612 100644 --- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c +++ b/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c @@ -75,10 +75,10 @@ void zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func) } } - init_request(&request); - init_result(¶m_result); + zbx_init_agent_request(&request); + zbx_init_agent_result(¶m_result); - if (SUCCEED != parse_item_key(init_param, &request)) + if (SUCCEED != zbx_parse_item_key(init_param, &request)) fail_msg("Cannot parse item key: %s", init_param); if (ZABBIX_MOCK_NET_IF_IN == net_if_func) @@ -122,6 +122,6 @@ void zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func) } } - free_request(&request); - free_result(¶m_result); + zbx_free_agent_request(&request); + zbx_free_agent_result(¶m_result); } diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c index e6221986e2e..fa728d13c39 100644 --- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c +++ b/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c @@ -57,15 +57,15 @@ void zbx_mock_test_entry(void **state) expected_string = expected_json; } - init_request(&request); - init_result(&result); + zbx_init_agent_request(&request); + zbx_init_agent_result(&result); - if (SUCCEED != parse_item_key("net.if.discovery", &request)) - fail_msg("Unexpected return code from parse_item_key()"); + if (SUCCEED != zbx_parse_item_key("net.if.discovery", &request)) + fail_msg("Unexpected return code from zbx_parse_item_key()"); actual_ret = NET_IF_DISCOVERY(&request, &result); - free_request(&request); + zbx_free_agent_request(&request); if (actual_ret != expected_ret) { @@ -87,7 +87,7 @@ void zbx_mock_test_entry(void **state) if (0 != strcmp(expected_string, actual_string)) fail_msg("Unexpected result string: expected \"%s\", got \"%s\"", expected_string, actual_string); - free_result(&result); + zbx_free_agent_result(&result); } /* fails on error, sets *value to NULL if parameter not found */ diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c index 231e7b071a8..f46d14ec260 100644 --- a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c @@ -52,10 +52,10 @@ void zbx_mock_test_entry(void **state) fail_msg("Parameters \"result\" and \"error\" cannot be both present in test case data."); } - init_request(&request); - init_result(&result); + zbx_init_agent_request(&request); + zbx_init_agent_result(&result); - if (SUCCEED != parse_item_key("system.boottime", &request)) + if (SUCCEED != zbx_parse_item_key("system.boottime", &request)) fail_msg("Parsing of \"system.boottime\" key failed."); switch (ret = SYSTEM_BOOTTIME(&request, &result)) @@ -80,6 +80,6 @@ void zbx_mock_test_entry(void **state) fail_msg("Unexpected return of SYSTEM_BOOTTIME(): %d (%s).", ret, zbx_sysinfo_ret_string(ret)); } - free_request(&request); - free_result(&result); + zbx_free_agent_request(&request); + zbx_free_agent_result(&result); } diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c index e04b5127f58..1672a2beb9b 100644 --- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c @@ -37,10 +37,10 @@ void zbx_mock_test_entry(void **state) ZBX_UNUSED(state); - init_result(&result); - init_request(&request); + zbx_init_agent_result(&result); + zbx_init_agent_request(&request); - if (SUCCEED != parse_item_key(itemkey, &request)) + if (SUCCEED != zbx_parse_item_key(itemkey, &request)) fail_msg("Invalid item key format '%s'", itemkey); if (read_yaml_ret() != (ret = SYSTEM_CPU_INTR(&request, &result))) @@ -59,6 +59,6 @@ void zbx_mock_test_entry(void **state) else if (NULL == ZBX_GET_MSG_RESULT(&result)) fail_msg("result does not contain failure message"); - free_request(&request); - free_result(&result); + zbx_free_agent_request(&request); + zbx_free_agent_result(&result); } diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c index 96525e443ea..f3ab4f79795 100644 --- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c @@ -80,8 +80,8 @@ void zbx_mock_test_entry(void **state) } } - init_request(&zbx_agent_request); - init_result(&zbx_agent_result); + zbx_init_agent_request(&zbx_agent_request); + zbx_init_agent_result(&zbx_agent_result); /* call the function-under-test */ actual_ret = SYSTEM_CPU_SWITCHES(&zbx_agent_request, &zbx_agent_result); @@ -121,6 +121,6 @@ void zbx_mock_test_entry(void **state) } } - free_request(&zbx_agent_request); - free_result(&zbx_agent_result); + zbx_free_agent_request(&zbx_agent_request); + zbx_free_agent_result(&zbx_agent_result); } diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c b/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c index b4bbd86ac62..a394c8e61e0 100644 --- a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c @@ -38,10 +38,10 @@ void zbx_mock_test_entry(void **state) expected_value = zbx_mock_get_parameter_string("out.value"); expected_result = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.return")); - init_request(&request); - init_result(&result); + zbx_init_agent_request(&request); + zbx_init_agent_result(&result); - if (SUCCEED != parse_item_key(param, &request)) + if (SUCCEED != zbx_parse_item_key(param, &request)) fail_msg("Cannot parse item key: %s", param); if (expected_result != (actual_result = SYSTEM_HW_CHASSIS(&request, &result))) @@ -65,6 +65,6 @@ void zbx_mock_test_entry(void **state) } } - free_request(&request); - free_result(&result); + zbx_free_agent_request(&request); + zbx_free_agent_result(&result); } diff --git a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c index c5e29e98a1d..571d521b4d6 100644 --- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c +++ b/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c @@ -68,8 +68,8 @@ void zbx_mock_test_entry(void **state) expected_string = expected_json; } - init_request(&request); - init_result(&result); + zbx_init_agent_request(&request); + zbx_init_agent_result(&result); if (expected_result != (actual_result = VFS_FS_DISCOVERY(&request, &result))) { @@ -90,6 +90,6 @@ void zbx_mock_test_entry(void **state) if (0 != strcmp(expected_string, actual_string)) fail_msg("Unexpected result string: expected \"%s\", got \"%s\"", expected_string, actual_string); - free_request(&request); - free_result(&result); + zbx_free_agent_request(&request); + zbx_free_agent_result(&result); } diff --git a/tests/libs/zbxsysinfo/parse_item_key.c b/tests/libs/zbxsysinfo/parse_item_key.c index eb1ecb81409..302f0e728d6 100644 --- a/tests/libs/zbxsysinfo/parse_item_key.c +++ b/tests/libs/zbxsysinfo/parse_item_key.c @@ -79,9 +79,9 @@ void zbx_mock_test_entry(void **state) fail_msg("Cannot get expected parameters from test case data: %s", zbx_mock_error_string(error)); } - init_request(&request); + zbx_init_agent_request(&request); - if (expected_result != (actual_result = parse_item_key(item_key, &request))) + if (expected_result != (actual_result = zbx_parse_item_key(item_key, &request))) { fail_msg("Got %s instead of %s as a result.", zbx_result_string(actual_result), zbx_result_string(expected_result)); @@ -129,5 +129,5 @@ void zbx_mock_test_entry(void **state) fail_msg("There are more actual parameters (%d) than expected (%d).", i, request.nparam); } - free_request(&request); + zbx_free_agent_request(&request); } diff --git a/tests/libs/zbxsysinfo/process.c b/tests/libs/zbxsysinfo/zbx_execute_agent_check.c index 09b6ba76127..bf48e3841f4 100644 --- a/tests/libs/zbxsysinfo/process.c +++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check.c @@ -69,9 +69,9 @@ void zbx_mock_test_entry(void **state) if (SUCCEED != zbx_is_uint32(flags_string, &flags_uint32)) fail_msg("Cannot convert flags to unsigned 32 bit integer."); - init_metrics(); + zbx_init_metrics(); - process(in_command_string, flags_uint32, &result); + zbx_execute_agent_check(in_command_string, flags_uint32, &result); if (NULL != (p = strchr(in_command_string, '['))) zbx_strlcpy(key, in_command_string, p - in_command_string + 1); diff --git a/tests/libs/zbxsysinfo/process.yaml b/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml index 49655beebed..49655beebed 100644 --- a/tests/libs/zbxsysinfo/process.yaml +++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml diff --git a/tests/libs/zbxsysinfo/process_http.c b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c index e558ab72c46..532e797f911 100644 --- a/tests/libs/zbxsysinfo/process_http.c +++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c @@ -56,9 +56,9 @@ void zbx_mock_test_entry(void **state) if (SUCCEED != zbx_is_uint32(flags_string, &flags_uint32)) fail_msg("Cannot convert flags to unsigned 32 bit integer."); - init_metrics(); + zbx_init_metrics(); - process(in_command_string, flags_uint32, &result); + zbx_execute_agent_check(in_command_string, flags_uint32, &result); if (NULL != (p = strchr(in_command_string, '['))) zbx_strlcpy(key, in_command_string, p - in_command_string + 1); diff --git a/tests/libs/zbxsysinfo/process_http.yaml b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml index b2fd1b62caf..b2fd1b62caf 100644 --- a/tests/libs/zbxsysinfo/process_http.yaml +++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml diff --git a/tests/zabbix_server/poller/test_get_value_ssh.c b/tests/zabbix_server/poller/test_get_value_ssh.c index 8798423d234..2edb9ec0bea 100644 --- a/tests/zabbix_server/poller/test_get_value_ssh.c +++ b/tests/zabbix_server/poller/test_get_value_ssh.c @@ -31,7 +31,7 @@ int zbx_get_value_ssh_test_run(DC_ITEM *item, char **error) AGENT_RESULT result; int ret; - init_result(&result); + zbx_init_agent_result(&result); ret = get_value_ssh(item, &result); if (NULL != result.msg && '\0' != *(result.msg)) @@ -40,7 +40,7 @@ int zbx_get_value_ssh_test_run(DC_ITEM *item, char **error) zbx_strlcpy(*error, result.msg, strlen(result.msg) * sizeof(char)); } - free_result(&result); + zbx_free_agent_result(&result); return ret; } diff --git a/tests/zabbix_server/poller/test_get_value_telnet.c b/tests/zabbix_server/poller/test_get_value_telnet.c index 29a3a5a1b47..8d82cf757ba 100644 --- a/tests/zabbix_server/poller/test_get_value_telnet.c +++ b/tests/zabbix_server/poller/test_get_value_telnet.c @@ -30,7 +30,7 @@ int zbx_get_value_telnet_test_run(DC_ITEM *item, char **error) AGENT_RESULT result; int ret; - init_result(&result); + zbx_init_agent_result(&result); ret = get_value_telnet(item, &result); if (NULL != result.msg && '\0' != *(result.msg)) @@ -39,7 +39,7 @@ int zbx_get_value_telnet_test_run(DC_ITEM *item, char **error) zbx_strlcpy(*error, result.msg, strlen(result.msg) * sizeof(char)); } - free_result(&result); + zbx_free_agent_result(&result); return ret; } diff --git a/tests/zabbix_server/trapper/Makefile.am b/tests/zabbix_server/trapper/Makefile.am index bc96b998a7f..2e2be5b6617 100644 --- a/tests/zabbix_server/trapper/Makefile.am +++ b/tests/zabbix_server/trapper/Makefile.am @@ -54,8 +54,8 @@ zbx_trapper_preproc_test_run_LDFLAGS = @SERVER_LDFLAGS@ \ -Wl,--wrap=DBget_user_by_auth_token \ -Wl,--wrap=zbx_user_init \ -Wl,--wrap=zbx_user_free \ - -Wl,--wrap=init_result \ - -Wl,--wrap=free_result + -Wl,--wrap=zbx_init_agent_result \ + -Wl,--wrap=zbx_free_agent_result zbx_trapper_preproc_test_run_CFLAGS = \ -I@top_srcdir@/tests @LIBXML2_CFLAGS@ diff --git a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c index 3dddaa33981..dcfc386ca96 100644 --- a/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c +++ b/tests/zabbix_server/trapper/zbx_trapper_preproc_test_run.c @@ -38,8 +38,8 @@ int __wrap_DBget_user_by_active_session(const char *sessionid, zbx_user_t *user) int __wrap_DBget_user_by_auth_token(const char *formatted_auth_token_hash, zbx_user_t *user); void __wrap_zbx_user_init(zbx_user_t *user); void __wrap_zbx_user_free(zbx_user_t *user); -void __wrap_init_result(AGENT_RESULT *result); -void __wrap_free_result(AGENT_RESULT *result); +void __wrap_zbx_init_agent_result(AGENT_RESULT *result); +void __wrap_zbx_free_agent_result(AGENT_RESULT *result); int __wrap_zbx_preprocessor_test(unsigned char value_type, const char *value, const zbx_timespec_t *ts, const zbx_vector_ptr_t *steps, zbx_vector_ptr_t *results, zbx_vector_ptr_t *history, @@ -118,12 +118,12 @@ void __wrap_zbx_user_free(zbx_user_t *user) zbx_free(user->username); } -void __wrap_init_result(AGENT_RESULT *result) +void __wrap_zbx_init_agent_result(AGENT_RESULT *result) { ZBX_UNUSED(result); } -void __wrap_free_result(AGENT_RESULT *result) +void __wrap_zbx_free_agent_result(AGENT_RESULT *result) { ZBX_UNUSED(result); } |