X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_relayd_backward_compat_group_by_session.c;h=dee0fabd41df9028435da3750e7f705f4ceb60ae;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=1be8df045c359ddb32fa6d65f042560e8811661c;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/unit/test_relayd_backward_compat_group_by_session.c b/tests/unit/test_relayd_backward_compat_group_by_session.c
index 1be8df045..dee0fabd4 100644
--- a/tests/unit/test_relayd_backward_compat_group_by_session.c
+++ b/tests/unit/test_relayd_backward_compat_group_by_session.c
@@ -1,29 +1,30 @@
 /*
- * Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+ * Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
  *
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <tap/tap.h>
 
+#include <common/time.h>
+
 #include "backward-compatibility-group-by.h"
 
 /* Number of TAP tests in this file */
 #define NUM_TESTS_PER_TEST 1
 
 struct test {
-	char *stream_path;
-	char *session_name;
-	char *hostname;
-	char *creation_time;
-	char *extra_path;
-	char *leftover;
+	const char *stream_path;
+	const char *session_name;
+	const char *hostname;
+	const char *creation_time;
+	const char *extra_path;
+	const char *leftover;
 	bool is_valid;
 };
 
@@ -97,40 +98,61 @@ struct test tests[] = {
 				"", "ust/uid/1000/64-bit", true},
 };
 
-static char *craft_expected(struct test *test)
+static char *craft_expected(struct test *test, time_t relay_session_creation_time)
 {
 	int ret;
 	char *result = NULL;
+	char relay_session_creation_datetime[DATETIME_STR_LEN];
+
+	ret = time_to_datetime_str(relay_session_creation_time,
+			relay_session_creation_datetime,
+			sizeof(relay_session_creation_datetime));
+	if (ret < 0) {
+		result = NULL;
+		goto end;
+	}
 
-	ret = asprintf(&result, "%s/%s%s%s/%s%s%s", test->session_name,
+	ret = asprintf(&result, "%s/%s-%s/%s%s%s", test->session_name,
 			test->hostname,
-			test->creation_time[0] != '\0' ? "-" : "",
-			test->creation_time, test->extra_path,
+			test->creation_time[0] == '\0' ?
+					relay_session_creation_datetime :
+					test->creation_time,
+			test->extra_path,
 			test->extra_path[0] != '\0' ? "/" : "", test->leftover);
 	if (ret < 0) {
 		result = NULL;
+		goto end;
 	}
+end:
 	return result;
 }
 
 int main(int argc, char **argv)
 {
+	int i;
 	int num_test = sizeof(tests) / sizeof(struct test);
+	const time_t test_time = time(NULL);
 
 	plan_tests(NUM_TESTS_PER_TEST * num_test);
 	diag("Backward compatibility utils for lttng-relayd --group-by-session");
-	for (int i = 0; i < num_test; i++) {
+
+	if (test_time == (time_t) -1) {
+		perror("Failed to sample time");
+		return exit_status();
+	}
+
+	for (i = 0; i < num_test; i++) {
 		char *expected = NULL;
 		char *result = NULL;
 
-		expected = craft_expected(&tests[i]);
+		expected = craft_expected(&tests[i], test_time);
 		if (!expected) {
 			fprintf(stderr, "Failed to craft expected output\n");
 			goto loop;
 		}
 
-		result = backward_compat_group_by_session(
-				tests[i].stream_path, tests[i].session_name);
+		result = backward_compat_group_by_session(tests[i].stream_path,
+				tests[i].session_name, test_time);
 		if (!result && tests[i].is_valid) {
 			fprintf(stderr, "Failed to get result\n");
 			goto loop;