From ca78c944d58b05766c234f1b93adeed43326f791 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 15 Aug 2022 17:50:51 -0400 Subject: [PATCH] tests: shorten names of session-rotation trace Filenames of this trace on the CI are too long for Windows, causing test failures. Shorten some directory names to avoid that Change-Id: I8d936af3efca894d55a94a57e3a3d4d5b0441305 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8694 Reviewed-by: Philippe Proulx Reviewed-by: Michael Jeanson (cherry picked from commit 8dea686a2397bdadb81f44a3e74fd39fd7397ee2) Reviewed-on: https://review.lttng.org/c/babeltrace/+/9549 Tested-by: jenkins --- .../ust/pid/10352}/chan_0 | Bin .../ust/pid/10352}/chan_1 | Bin .../ust/pid/10352}/chan_2 | Bin .../ust/pid/10352}/chan_3 | Bin .../ust/pid/10352}/index/chan_0.idx | Bin .../ust/pid/10352}/index/chan_1.idx | Bin .../ust/pid/10352}/index/chan_2.idx | Bin .../ust/pid/10352}/index/chan_3.idx | Bin .../ust/pid/10352}/metadata | Bin .../ust/pid/10353}/chan_0 | Bin .../ust/pid/10353}/chan_1 | Bin .../ust/pid/10353}/chan_2 | Bin .../ust/pid/10353}/chan_3 | Bin .../ust/pid/10353}/index/chan_0.idx | Bin .../ust/pid/10353}/index/chan_1.idx | Bin .../ust/pid/10353}/index/chan_2.idx | Bin .../ust/pid/10353}/index/chan_3.idx | Bin .../ust/pid/10353}/metadata | Bin .../1/ust/pid/10352}/chan_0 | Bin .../1/ust/pid/10352}/chan_1 | Bin .../1/ust/pid/10352}/chan_2 | Bin .../1/ust/pid/10352}/chan_3 | Bin .../1/ust/pid/10352}/index/chan_0.idx | Bin .../1/ust/pid/10352}/index/chan_1.idx | Bin .../1/ust/pid/10352}/index/chan_2.idx | Bin .../1/ust/pid/10352}/index/chan_3.idx | Bin .../1/ust/pid/10352}/metadata | Bin .../1/ust/pid/10353}/chan_0 | Bin .../1/ust/pid/10353}/chan_1 | Bin .../1/ust/pid/10353}/chan_2 | Bin .../1/ust/pid/10353}/chan_3 | Bin .../1/ust/pid/10353}/index/chan_0.idx | Bin .../1/ust/pid/10353}/index/chan_1.idx | Bin .../1/ust/pid/10353}/index/chan_2.idx | Bin .../1/ust/pid/10353}/index/chan_3.idx | Bin .../1/ust/pid/10353}/metadata | Bin .../2/ust/pid/10352}/chan_0 | Bin .../2/ust/pid/10352}/chan_1 | Bin .../2/ust/pid/10352}/chan_2 | 0 .../2/ust/pid/10352}/chan_3 | Bin .../2/ust/pid/10352}/index/chan_0.idx | Bin .../2/ust/pid/10352}/index/chan_1.idx | Bin .../2/ust/pid/10352}/index/chan_2.idx | Bin .../2/ust/pid/10352}/index/chan_3.idx | Bin .../2/ust/pid/10352}/metadata | Bin .../2/ust/pid/10353}/chan_0 | Bin .../2/ust/pid/10353}/chan_1 | 0 .../2/ust/pid/10353}/chan_2 | Bin .../2/ust/pid/10353}/chan_3 | 0 .../2/ust/pid/10353}/index/chan_0.idx | Bin .../2/ust/pid/10353}/index/chan_1.idx | Bin .../2/ust/pid/10353}/index/chan_2.idx | Bin .../2/ust/pid/10353}/index/chan_3.idx | Bin .../2/ust/pid/10353}/metadata | Bin .../query/test_query_support_info.py | 56 +++++++++--------- 55 files changed, 28 insertions(+), 28 deletions(-) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748 => 3/ust/pid/10352}/metadata (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748 => 3/ust/pid/10353}/metadata (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748 => a/1/ust/pid/10352}/metadata (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748 => a/1/ust/pid/10353}/metadata (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748 => a/2/ust/pid/10352}/metadata (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/chan_0 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/chan_1 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/chan_2 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/chan_3 (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/index/chan_0.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/index/chan_1.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/index/chan_2.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/index/chan_3.idx (100%) rename tests/data/ctf-traces/succeed/session-rotation/{archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748 => a/2/ust/pid/10353}/metadata (100%) diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_0 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_0 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_1 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_1 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_2 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_2 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_3 b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_3 rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/metadata b/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/metadata rename to tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/metadata diff --git a/tests/plugins/src.ctf.fs/query/test_query_support_info.py b/tests/plugins/src.ctf.fs/query/test_query_support_info.py index f094865a..61778156 100644 --- a/tests/plugins/src.ctf.fs/query/test_query_support_info.py +++ b/tests/plugins/src.ctf.fs/query/test_query_support_info.py @@ -26,49 +26,49 @@ session_rotation_trace_path = os.path.join( trace_10352_1 = os.path.join( session_rotation_trace_path, - 'archives', - '20190826T155748-0400-20190826T155751-0400-1', - 'ust', - 'pid', - 'hello-ust-10352-20190826-155748', + "a", + "1", + "ust", + "pid", + "10352", ) trace_10353_1 = os.path.join( session_rotation_trace_path, - 'archives', - '20190826T155748-0400-20190826T155751-0400-1', - 'ust', - 'pid', - 'hello-ust-10353-20190826-155748', + "a", + "1", + "ust", + "pid", + "10353", ) trace_10352_2 = os.path.join( session_rotation_trace_path, - 'archives', - '20190826T155750-0400-20190826T155753-0400-2', - 'ust', - 'pid', - 'hello-ust-10352-20190826-155748', + "a", + "2", + "ust", + "pid", + "10352", ) trace_10353_2 = os.path.join( session_rotation_trace_path, - 'archives', - '20190826T155750-0400-20190826T155753-0400-2', - 'ust', - 'pid', - 'hello-ust-10353-20190826-155748', + "a", + "2", + "ust", + "pid", + "10353", ) trace_10352_3 = os.path.join( session_rotation_trace_path, - '20190826T155753-0400-3', - 'ust', - 'pid', - 'hello-ust-10352-20190826-155748', + "3", + "ust", + "pid", + "10352", ) trace_10353_3 = os.path.join( session_rotation_trace_path, - '20190826T155753-0400-3', - 'ust', - 'pid', - 'hello-ust-10353-20190826-155748', + "3", + "ust", + "pid", + "10353", ) -- 2.34.1