Merge branch 'main' into feature/maas-subscription-additional-test

Author: dbasunag

tests/model_registry/model_catalog/search/test_model_search.py

@@ -59,7 +59,9 @@ def test_search_model_catalog_source_label(
         )["size"]
         LOGGER.info(f"no_filtered_models_size: {no_filtered_models_size}")
         assert no_filtered_models_size > 0
-        assert no_filtered_models_size == both_filtered_models_size
+        # no_filtered includes models from sources without labels (e.g. Other Models),
+        # which cannot be queried via sourceLabel, so total >= labeled sum
+        assert no_filtered_models_size >= both_filtered_models_size
         assert redhat_ai_filter_moldels_size + redhat_ai_validated_filter_models_size == both_filtered_models_size
 
     @pytest.mark.tier3
@@ -72,6 +74,7 @@ def test_search_model_catalog_invalid_source_label(
         Validate search model catalog by invalid source label
         """
 
+        # "null" is a valid source label for sources without explicit labels (e.g. Other Models)
         null_size = get_models_from_catalog_api(
             model_catalog_rest_url=model_catalog_rest_url,
             model_registry_rest_headers=model_registry_rest_headers,
@@ -84,9 +87,8 @@ def test_search_model_catalog_invalid_source_label(
             source_label="invalid",
         )["size"]
 
-        assert null_size == invalid_size == 0, (
-            "Expected 0 models for null and invalid source label found {null_size} and {invalid_size}"
-        )
+        assert null_size >= 0, f"Expected non-negative size for null source label, got {null_size}"
+        assert invalid_size == 0, f"Expected 0 models for invalid source label, got {invalid_size}"
 
     @pytest.mark.parametrize(
         "randomly_picked_model_from_catalog_api_by_source,source_filter",