Test/imgtestlib/gen_build_info_dir_path_prefix: use "manifest-id-<ID>"

Prefix the manifest_id value in the generated path prefix with "manifest-id-" to make it obvious what the value represents. Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Jan 7, 2025 · 08f5bb5 · 08f5bb5
1 parent e11626e
commit 08f5bb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/scripts/imgtestlib.py b/test/scripts/imgtestlib.py
@@ -161,7 +161,7 @@ def gen_build_info_dir_path_prefix(osbuild_ref, runner_distro, distro=None, arch
     The returned path always has a trailing separator at the end to signal that it is a directory.
     """
     path = os.path.join(f"osbuild-ref-{osbuild_ref}", f"runner-{runner_distro}")
-    for p in (distro, arch, manifest_id):
+    for p in (distro, arch, f"manifest-id-{manifest_id}" if manifest_id else None):
         if p is None:
             return path + "/"
         path = os.path.join(path, p)

diff --git a/test/scripts/test_imgtestlib.py b/test/scripts/test_imgtestlib.py
@@ -70,7 +70,7 @@ def test_read_seed():
             "arch": "x86_64",
             "manifest_id": "abc123123",
         },
-        "osbuild-ref-abc123/runner-fedora-41/fedora-41/x86_64/abc123123/"
+        "osbuild-ref-abc123/runner-fedora-41/fedora-41/x86_64/manifest-id-abc123123/"
     ),
     # Optional arg 'distro' not specified, thus following optional args 'arch' and 'manifest_id' are ignored
     (
@@ -107,7 +107,7 @@ def test_gen_build_info_dir_path_prefix(kwargs, expected):
             "manifest_id": "abc123"
         },
         testlib.S3_BUCKET + "/" + testlib.S3_PREFIX + \
-            "/osbuild-ref-abcdef123456/runner-fedora-41/fedora-41/aarch64/abc123/",
+            "/osbuild-ref-abcdef123456/runner-fedora-41/fedora-41/aarch64/manifest-id-abc123/",
     ),
     (
         {