Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iib/workers/tasks/build_merge_index_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def parse_version(version):
# Validate the bundles and bundle_images lenght
if len(bundle_version_names) != len(bundles):
uniq_verions = [x[2] for x in bundle_version_names]
diff = set(bundles) - set(uniq_verions)
diff = sorted(set(bundles) - set(uniq_verions))
raise IIBError(f"Failed to retrieve bundles by semver, missing bundle images: {diff}")

# Retrieve the latest version of all bundle packages.
Expand Down
15 changes: 7 additions & 8 deletions tests/test_workers/test_tasks/test_build_merge_index_image.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
import json
import os
import re
import stat
from unittest import mock

Expand Down Expand Up @@ -1085,7 +1086,7 @@ def test_get_bundles_latest_version(bundle_images, expected):
'version': '1.2.34',
},
],
set(["operator2@sha256:1000"]),
["operator2@sha256:1000"],
),
(
[
Expand All @@ -1110,16 +1111,14 @@ def test_get_bundles_latest_version(bundle_images, expected):
'version': '3.0.0',
},
],
set(
[
"missing-operator@sha256:1234",
"missing-operator@sha256:0001",
]
),
[
"missing-operator@sha256:0001",
"missing-operator@sha256:1234",
],
),
],
)
def test_get_bundles_latest_version_missing_bundles(bundles, bundle_images, diff_bundles):
err = f"Failed to retrieve bundles by semver, missing bundle images: {diff_bundles}"
with pytest.raises(IIBError, match=err):
with pytest.raises(IIBError, match=re.escape(err)):
build_merge_index_image.get_bundles_latest_version(bundles, bundle_images)