Skip to content

Commit 1bdb755

Browse files
committed
tests: runtime: out_stackdriver: fix unit test, avoid double flb_start()
Signed-off-by: Eduardo Silva <[email protected]>
1 parent f1001eb commit 1bdb755

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

tests/runtime/out_stackdriver.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ static void cb_check_timestamp_format_object_not_a_map(void *ctx, int ffd,
14561456
}
14571457

14581458
static void cb_check_timestamp_format_object_missing_subfield(void *ctx, int ffd,
1459-
int res_ret, void *res_data,
1459+
int res_ret, void *res_data,
14601460
size_t res_size,
14611461
void *data)
14621462
{
@@ -1472,7 +1472,7 @@ static void cb_check_timestamp_format_object_missing_subfield(void *ctx, int ffd
14721472
}
14731473

14741474
static void cb_check_timestamp_format_object_incorrect_subfields(void *ctx, int ffd,
1475-
int res_ret, void *res_data,
1475+
int res_ret, void *res_data,
14761476
size_t res_size,
14771477
void *data)
14781478
{
@@ -2115,10 +2115,6 @@ void flb_test_resource_k8s_container_multi_tag_value()
21152115
cb_check_k8s_container_resource_diff_tag,
21162116
NULL, NULL);
21172117

2118-
/* Start */
2119-
ret = flb_start(ctx);
2120-
TEST_CHECK(ret == 0);
2121-
21222118
/* Ingest data sample */
21232119
flb_lib_push(ctx, in_ffd, (char *) K8S_CONTAINER_COMMON_DIFF_TAGS, size_two);
21242120

@@ -2442,7 +2438,7 @@ void flb_test_resource_k8s_container_no_local_resource_id()
24422438

24432439
/* Lib input mode */
24442440
in_ffd = flb_input(ctx, (char *) "lib", NULL);
2445-
flb_input_set(ctx, in_ffd, "tag",
2441+
flb_input_set(ctx, in_ffd, "tag",
24462442
"k8s_container.testnamespace.testpod.testctr", NULL);
24472443

24482444
/* Stackdriver output */
@@ -2572,9 +2568,9 @@ void flb_test_multi_entries_severity()
25722568

25732569
/* Tail input mode */
25742570
in_ffd = flb_input(ctx, (char *) "tail", NULL);
2575-
ret = flb_input_set(ctx, in_ffd,
2571+
ret = flb_input_set(ctx, in_ffd,
25762572
"Path", STACKDRIVER_DATA_PATH "/stackdriver_multi_entries_severity.log",
2577-
"tag", "test",
2573+
"tag", "test",
25782574
NULL);
25792575
TEST_CHECK_(ret == 0, "setting input options");
25802576

@@ -3573,7 +3569,7 @@ TEST_LIST = {
35733569
{"insertId_common_case", flb_test_insert_id_common_case},
35743570
{"empty_insertId", flb_test_empty_insert_id},
35753571
{"insertId_incorrect_type_int", flb_test_insert_id_incorrect_type},
3576-
3572+
35773573
/* test operation */
35783574
{"operation_common_case", flb_test_operation_common},
35793575
{"empty_operation", flb_test_empty_operation},
@@ -3590,7 +3586,7 @@ TEST_LIST = {
35903586
{"sourceLocation_partial_subfields", flb_test_source_location_partial_subfields},
35913587
{"sourceLocation_subfields_in_incorrect_type", flb_test_source_location_incorrect_type_subfields},
35923588
{"sourceLocation_extra_subfields_exist", flb_test_source_location_extra_subfields},
3593-
3589+
35943590
/* test k8s */
35953591
{"resource_k8s_container_common", flb_test_resource_k8s_container_common },
35963592
{"resource_k8s_container_no_local_resource_id", flb_test_resource_k8s_container_no_local_resource_id },

0 commit comments

Comments
 (0)