Skip to content

Commit 64b7467

Browse files
authored
ISV-5501: Validate release-config.yaml with json schema - update bundle check naming to be consistent with check_* convention (#778)
Signed-off-by: John Bell <jbell@redhat.com>
1 parent ae7f386 commit 64b7467

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

operator-pipeline-images/operatorcert/static_tests/common/bundle.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ def check_bundle_release_config(bundle: Bundle) -> Iterator[CheckResult]:
167167
)
168168

169169

170-
def validate_schema_bundle_release_config(bundle: Bundle) -> Iterator[CheckResult]:
170+
def check_validate_schema_bundle_release_config(
171+
bundle: Bundle,
172+
) -> Iterator[CheckResult]:
171173
"""
172174
Validate the bundle release config against the json schema
173175
"""

operator-pipeline-images/tests/static_tests/common/test_bundle.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from operatorcert.static_tests.common.bundle import (
77
check_operator_name,
88
check_bundle_release_config,
9-
validate_schema_bundle_release_config,
9+
check_validate_schema_bundle_release_config,
1010
)
1111
from tests.utils import bundle_files, create_files
1212

@@ -636,7 +636,7 @@ def test_check_bundle_release_config(
636636
],
637637
indirect=False,
638638
)
639-
def test_validate_schema_bundle_release_config(
639+
def test_check_validate_schema_bundle_release_config(
640640
tmp_path: Path,
641641
files: list[dict[str, Any]],
642642
bundle_to_check: tuple[str, str],
@@ -648,5 +648,6 @@ def test_validate_schema_bundle_release_config(
648648
operator = repo.operator(operator_name)
649649
bundle = operator.bundle(bundle_version)
650650
assert {
651-
(x.__class__, x.reason) for x in validate_schema_bundle_release_config(bundle)
651+
(x.__class__, x.reason)
652+
for x in check_validate_schema_bundle_release_config(bundle)
652653
} == expected_results

0 commit comments

Comments
 (0)