fixup! tweak test to sort refs/remove duplicates to make rpm stage co…

…mparable without too much noise
osbuild · Sep 16, 2024 · 4c83c00 · 4c83c00
1 parent 320aa7a
commit 4c83c00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/example/centos/centos-9-x86_64-ami.yaml b/example/centos/centos-9-x86_64-ami.yaml
@@ -21,24 +21,17 @@ otk.define:
           include:
             - coreutils
             - dosfstools
-            - dosfstools
             - glibc
             - grub2-pc
-            - grub2-pc
             - platform-python
             - policycoreutils
-            - policycoreutils
             - python3
             - python3-pyyaml
-            - python3-pyyaml
             - rpm
             - rpm
             - selinux-policy-targeted
-            - selinux-policy-targeted
-            - selinux-policy-targeted
             - systemd
             - xfsprogs
-            - xfsprogs
             - xz
           exclude: []
     os:

diff --git a/test/test_against_images_refs.py b/test/test_against_images_refs.py
@@ -37,8 +37,12 @@ def fixup_references(manifest):
     for pipeline in manifest["pipelines"]:
         for stage in pipeline["stages"]:
             if stage["type"] == "org.osbuild.rpm":
-                refs = stage["inputs"]["packages"]["references"]
-                stage["inputs"]["packages"]["references"] = sorted(refs, key=lambda x: x["id"])
+                # sort refs/remove duplicates
+                ids = set(x["id"]
+                          for x in stage["inputs"]["packages"]["references"])
+                refs = sorted([{"id": i}
+                               for i in ids], key=lambda x: x["id"])
+                stage["inputs"]["packages"]["references"] = refs
 
 
 @pytest.mark.parametrize("tc", reference_manifests())