X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_relayd_backward_compat_group_by_session.cpp;h=cfd5b1a975d87fe3b5be688c49a37ef9dc491091;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=602376c4376588f9be54888488a047d3e79c9b4c;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d;p=lttng-tools.git

diff --git a/tests/unit/test_relayd_backward_compat_group_by_session.cpp b/tests/unit/test_relayd_backward_compat_group_by_session.cpp
index 602376c43..cfd5b1a97 100644
--- a/tests/unit/test_relayd_backward_compat_group_by_session.cpp
+++ b/tests/unit/test_relayd_backward_compat_group_by_session.cpp
@@ -5,15 +5,14 @@
  *
  */
 
+#include "backward-compatibility-group-by.hpp"
+
+#include <common/time.hpp>
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <common/time.hpp>
-
-#include "backward-compatibility-group-by.hpp"
-
 #include <tap/tap.h>
 
 /* Number of TAP tests in this file */
@@ -36,69 +35,110 @@ int lttng_opt_mi;
 int lttng_opt_verbose;
 
 struct test tests[] = {
-		/* Default name session streaming. */
-		{"hostname/auto-20190918-164429/ust/uid/1000/64-bit",
-				"auto-20190918-164429", "hostname",
-				"20190918-164429", "", "ust/uid/1000/64-bit",
-				true},
-		/* Custom default name session */
-		{"hostname/custom_auto-20190319-120000/ust/uid/1000/64-bit",
-				"custom_auto-20190319-120000", "hostname",
-				"20190319-120000", "", "ust/uid/1000/64-bit",
-				true},
-		/* Named session streaming */
-		{"hostname/test-20190918-164709/ust/uid/1000/64-bit", "test",
-				"hostname", "20190918-164709", "",
-				"ust/uid/1000/64-bit", true},
-		/* Default session snapshot streaming */
-		{"hostname//snapshot-1-20190918-164829-0/ust//uid/1000/64-bit",
-				"my_session", "hostname", "", "",
-				"snapshot-1-20190918-164829-0/ust//uid/1000/64-bit",
-				true},
-		/* Named session snapshot streaming */
-		{"hostname//snapshot-1-20190918-175919-0/ust//uid/1000/64-bit",
-				"my_session", "hostname", "", "",
-				"snapshot-1-20190918-175919-0/ust//uid/1000/64-bit",
-				true},
-		/* Default name session, live */
-		{"hostname//auto-20190918-171641/ust/uid/1000/64-bit",
-				"auto-20190918-171641", "hostname",
-				"20190918-171641", "", "ust/uid/1000/64-bit",
-				true},
-		/* Named session, live */
-		{"hostname//test-20190918-180333//ust/uid/1000/64-bit",
-				"test-20190918-180333", "hostname",
-				"20190918-180333", "", "/ust/uid/1000/64-bit",
-				true},
-		/* Default name session, streaming & live , extra path */
-		{"hostname/extra/path/ust/uid/1000/64-bit",
-				"auto-20190919-122110", "hostname",
-				"20190919-122110", "extra",
-				"path/ust/uid/1000/64-bit", true},
-		/* Named session, live, extra path */
-		{"hostname/extra/path/ust/uid/1000/64-bit", "test", "hostname",
-				"", "extra", "path/ust/uid/1000/64-bit", true},
-		/* Named session, snapshot, extra path */
-		{"hostname/extra/path/snapshot-1-20190919-140702-0/ust//uid/1000/64-bit",
-				"test", "hostname", "", "extra",
-				"path/snapshot-1-20190919-140702-0/ust//uid/1000/64-bit",
-				true},
-		/* Corner cases*/
-		/* Named session with valid datetime in it */
-		/* Default name session, extra path with session name in it*/
-		{"hostname/test-20190319-120000-20190918-180921/ust/uid/1000/64-bit",
-				"test-20190319-120000", "hostname",
-				"20190918-180921", "", "ust/uid/1000/64-bit",
-				true},
-		/* Empty path */
-		{"", "test", "", "", "", "", false},
-		/* Path without second token */
-		{"hostname", "test", "hostname", "", "", "", false},
-		/* No leftover */
-		{"hostname/test", "test", "hostname", "", "", "", true},
-		/* Path with ession name but no datetime */
-		{"hostname/test/ust/uid/1000/64-bit", "test", "hostname", "",
-				"", "ust/uid/1000/64-bit", true},
+	/* Default name session streaming. */
+	{ "hostname/auto-20190918-164429/ust/uid/1000/64-bit",
+	  "auto-20190918-164429",
+	  "hostname",
+	  "20190918-164429",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
+	/* Custom default name session */
+	{ "hostname/custom_auto-20190319-120000/ust/uid/1000/64-bit",
+	  "custom_auto-20190319-120000",
+	  "hostname",
+	  "20190319-120000",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
+	/* Named session streaming */
+	{ "hostname/test-20190918-164709/ust/uid/1000/64-bit",
+	  "test",
+	  "hostname",
+	  "20190918-164709",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
+	/* Default session snapshot streaming */
+	{ "hostname//snapshot-1-20190918-164829-0/ust//uid/1000/64-bit",
+	  "my_session",
+	  "hostname",
+	  "",
+	  "",
+	  "snapshot-1-20190918-164829-0/ust//uid/1000/64-bit",
+	  true },
+	/* Named session snapshot streaming */
+	{ "hostname//snapshot-1-20190918-175919-0/ust//uid/1000/64-bit",
+	  "my_session",
+	  "hostname",
+	  "",
+	  "",
+	  "snapshot-1-20190918-175919-0/ust//uid/1000/64-bit",
+	  true },
+	/* Default name session, live */
+	{ "hostname//auto-20190918-171641/ust/uid/1000/64-bit",
+	  "auto-20190918-171641",
+	  "hostname",
+	  "20190918-171641",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
+	/* Named session, live */
+	{ "hostname//test-20190918-180333//ust/uid/1000/64-bit",
+	  "test-20190918-180333",
+	  "hostname",
+	  "20190918-180333",
+	  "",
+	  "/ust/uid/1000/64-bit",
+	  true },
+	/* Default name session, streaming & live , extra path */
+	{ "hostname/extra/path/ust/uid/1000/64-bit",
+	  "auto-20190919-122110",
+	  "hostname",
+	  "20190919-122110",
+	  "extra",
+	  "path/ust/uid/1000/64-bit",
+	  true },
+	/* Named session, live, extra path */
+	{ "hostname/extra/path/ust/uid/1000/64-bit",
+	  "test",
+	  "hostname",
+	  "",
+	  "extra",
+	  "path/ust/uid/1000/64-bit",
+	  true },
+	/* Named session, snapshot, extra path */
+	{ "hostname/extra/path/snapshot-1-20190919-140702-0/ust//uid/1000/64-bit",
+	  "test",
+	  "hostname",
+	  "",
+	  "extra",
+	  "path/snapshot-1-20190919-140702-0/ust//uid/1000/64-bit",
+	  true },
+	/* Corner cases*/
+	/* Named session with valid datetime in it */
+	/* Default name session, extra path with session name in it*/
+	{ "hostname/test-20190319-120000-20190918-180921/ust/uid/1000/64-bit",
+	  "test-20190319-120000",
+	  "hostname",
+	  "20190918-180921",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
+	/* Empty path */
+	{ "", "test", "", "", "", "", false },
+	/* Path without second token */
+	{ "hostname", "test", "hostname", "", "", "", false },
+	/* No leftover */
+	{ "hostname/test", "test", "hostname", "", "", "", true },
+	/* Path with ession name but no datetime */
+	{ "hostname/test/ust/uid/1000/64-bit",
+	  "test",
+	  "hostname",
+	  "",
+	  "",
+	  "ust/uid/1000/64-bit",
+	  true },
 };
 
 static char *craft_expected(struct test *test, time_t relay_session_creation_time)
@@ -108,20 +148,22 @@ static char *craft_expected(struct test *test, time_t relay_session_creation_tim
 	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));
+				   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", test->session_name,
-			test->hostname,
-			test->creation_time[0] == '\0' ?
-					relay_session_creation_datetime :
-					test->creation_time,
-			test->extra_path,
-			test->extra_path[0] != '\0' ? "/" : "", test->leftover);
+	ret = asprintf(&result,
+		       "%s/%s-%s/%s%s%s",
+		       test->session_name,
+		       test->hostname,
+		       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;
@@ -154,8 +196,8 @@ int main(void)
 			goto loop;
 		}
 
-		result = backward_compat_group_by_session(tests[i].stream_path,
-				tests[i].session_name, test_time);
+		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;
@@ -165,8 +207,10 @@ int main(void)
 		}
 
 		ok(strncmp(expected, result, strlen(expected)) == 0,
-				"In: %s, out: %s, expected: %s",
-				tests[i].stream_path, result, expected);
+		   "In: %s, out: %s, expected: %s",
+		   tests[i].stream_path,
+		   result,
+		   expected);
 	loop:
 		free(expected);
 		free(result);