From 7cb87d59e06f4742fe103c458aa0184072a888c9 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sun, 26 Oct 2025 05:48:11 +0100 Subject: [PATCH] stats: test-stats-common - Rename test_init() to test_stats_init() --- src/stats/test-client-reader.c | 8 ++++---- src/stats/test-client-writer.c | 4 ++-- src/stats/test-stats-common.c | 4 ++-- src/stats/test-stats-common.h | 4 ++-- src/stats/test-stats-metrics.c | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/stats/test-client-reader.c b/src/stats/test-client-reader.c index 8627e82304..f95ad0d9f2 100644 --- a/src/stats/test-client-reader.c +++ b/src/stats/test-client-reader.c @@ -98,7 +98,7 @@ static void test_client_reader(void) test_begin("client reader"); /* register some stats */ - test_init(settings_blob_1); + test_stats_init(settings_blob_1); client_readers_init(); conn_list = connection_list_init(&client_set, &client_vfuncs); @@ -116,7 +116,7 @@ static void test_client_reader(void) /* check output from reader */ test_dump_metrics(); - test_deinit(); + test_stats_deinit(); client_readers_deinit(); connection_list_deinit(&conn_list); @@ -193,7 +193,7 @@ static void test_client_reader_group_by(void) test_begin("client reader (group by)"); /* register some stats */ - test_init(settings_blob_2); + test_stats_init(settings_blob_2); client_readers_init(); conn_list = connection_list_init(&client_set, &client_vfuncs); @@ -212,7 +212,7 @@ static void test_client_reader_group_by(void) /* check output from reader */ test_dump_metrics_group_by(); - test_deinit(); + test_stats_deinit(); client_readers_deinit(); connection_list_deinit(&conn_list); diff --git a/src/stats/test-client-writer.c b/src/stats/test-client-writer.c index 0ab3bdfb39..f79f235258 100644 --- a/src/stats/test-client-writer.c +++ b/src/stats/test-client-writer.c @@ -109,7 +109,7 @@ static void test_client_writer(void) test_begin("client writer"); /* register some stats */ - test_init(settings_blob_1); + test_stats_init(settings_blob_1); client_writers_init(); conn_list = connection_list_init(&client_set, &client_vfuncs); @@ -124,7 +124,7 @@ static void test_client_writer(void) test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1); test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0); - test_deinit(); + test_stats_deinit(); client_writers_deinit(); connection_list_deinit(&conn_list); diff --git a/src/stats/test-stats-common.c b/src/stats/test-stats-common.c index 12014087fa..18254de38d 100644 --- a/src/stats/test-stats-common.c +++ b/src/stats/test-stats-common.c @@ -43,7 +43,7 @@ static struct stats_settings *read_settings(const char *const settings[], return set; } -void test_init(const char *const settings_blob[]) +void test_stats_init(const char *const settings_blob[]) { const char *error; @@ -70,7 +70,7 @@ void test_init(const char *const settings_blob[]) event_unref(&event); } -void test_deinit(void) +void test_stats_deinit(void) { stats_metrics_deinit(&stats_metrics); settings_free(stats_set); diff --git a/src/stats/test-stats-common.h b/src/stats/test-stats-common.h index de3af69177..a8253bea50 100644 --- a/src/stats/test-stats-common.h +++ b/src/stats/test-stats-common.h @@ -20,8 +20,8 @@ bool test_stats_callback(struct event *event, struct failure_context *ctx, const char *fmt ATTR_UNUSED, va_list args ATTR_UNUSED); -void test_init(const char *const settings_blob[]); -void test_deinit(void); +void test_stats_init(const char *const settings_blob[]); +void test_stats_deinit(void); void test_event_send(struct event *event); diff --git a/src/stats/test-stats-metrics.c b/src/stats/test-stats-metrics.c index 8208b5b3fd..cfed2ab769 100644 --- a/src/stats/test-stats-metrics.c +++ b/src/stats/test-stats-metrics.c @@ -29,7 +29,7 @@ static void test_stats_metrics(void) test_begin("stats metrics (event counting)"); /* register some stats */ - test_init(settings_blob_1); + test_stats_init(settings_blob_1); /* push event in */ struct event *event = event_create(NULL); @@ -41,7 +41,7 @@ static void test_stats_metrics(void) test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1); test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0); - test_deinit(); + test_stats_deinit(); test_end(); } @@ -56,7 +56,7 @@ static void test_stats_metrics_filter(void) { test_begin("stats metrics (filter)"); - test_init(settings_blob_2); + test_stats_init(settings_blob_2); /* check filter */ struct event_filter *filter = @@ -88,7 +88,7 @@ static void test_stats_metrics_filter(void) test_assert(get_stats_dist_field("test", STATS_DIST_COUNT) == 1); test_assert(get_stats_dist_field("test", STATS_DIST_SUM) > 0); - test_deinit(); + test_stats_deinit(); test_end(); } @@ -197,7 +197,7 @@ test_stats_metrics_group_by_discrete_real(const struct discrete_test *test, const char *const *all_settings = t_strsplit( t_strconcat(t_strarray_join(base_settings, " "), " ", t_strarray_join(test->settings_blob, " "), NULL), " "); - test_init(all_settings); + test_stats_init(all_settings); for (i = 0; i < test->num_values; i++) { for (j = 0; j < test->num_values; j++) { @@ -249,7 +249,7 @@ test_stats_metrics_group_by_discrete_real(const struct discrete_test *test, } } - test_deinit(); + test_stats_deinit(); test_end(); } @@ -409,7 +409,7 @@ test_stats_metrics_group_by_quantized_real(const struct quantized_test *test, const char *const *all_settings = t_strsplit( t_strconcat(t_strarray_join(base_settings, " "), " ", t_strarray_join(test->settings_blob, " "), NULL), " "); - test_init(all_settings); + test_stats_init(all_settings); struct event *event; @@ -486,7 +486,7 @@ test_stats_metrics_group_by_quantized_real(const struct quantized_test *test, METRIC_VALUE_TYPE_BUCKET_INDEX); } - test_deinit(); + test_stats_deinit(); test_end(); } -- 2.47.3