update tests for profile_paths variable

Author: douglowe

tests/test_api_routes.py

@@ -13,7 +13,7 @@ def client():
 # Test POST API: /v1/ro_crates/{crate_id}/validation
 
 @pytest.mark.parametrize(
-        "crate_id, payload, status_code, response_json",
+        "crate_id, payload, profiles_path, status_code, response_json",
         [
             (
                 "crate-123", {
@@ -27,7 +27,9 @@ def client():
                     "root_path": "base_path",
                     "webhook_url": "https://webhook.example.com",
                     "profile_name": "default"
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
             (
                 "crate-123", {
@@ -38,9 +40,11 @@ def client():
                         "ssl": False,
                         "bucket": "test_bucket"
                     },
-                     "root_path": "base_path",
+                    "root_path": "base_path",
                     "webhook_url": "https://webhook.example.com",
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
             (
                 "crate-123", {
@@ -51,9 +55,11 @@ def client():
                         "ssl": False,
                         "bucket": "test_bucket"
                     },
-                     "root_path": "base_path",
+                    "root_path": "base_path",
                     "profile_name": "default"
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
             (
                 "crate-123", {
@@ -66,7 +72,9 @@ def client():
                     },
                     "webhook_url": "https://webhook.example.com",
                     "profile_name": "default"
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
             (
                 "crate-123", {
@@ -77,14 +85,17 @@ def client():
                         "ssl": False,
                         "bucket": "test_bucket"
                     },
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
         ],
         ids=["validate_by_id", "validate_with_missing_profile_name",
              "validate_with_missing_webhook_url", "validate_with_missing_root_path",
              "validate_with_missing_root_path_and_profile_name_and_webhook_url"]
 )
-def test_validate_by_id_success(client: FlaskClient, crate_id: str, payload: dict, status_code: int, response_json: dict):
+def test_validate_by_id_success(client: FlaskClient, crate_id: str, payload: dict,
+                                profiles_path: str, status_code: int, response_json: dict):
     with patch("app.ro_crates.routes.post_routes.queue_ro_crate_validation_task") as mock_queue:
         mock_queue.return_value = (response_json, status_code)
 
@@ -96,7 +107,7 @@ def test_validate_by_id_success(client: FlaskClient, crate_id: str, payload: dic
         webhook_url = payload["webhook_url"] if "webhook_url" in payload else None
         assert response.status_code == status_code
         assert response.json == response_json
-        mock_queue.assert_called_once_with(minio_config, crate_id, root_path, profile_name, webhook_url)
+        mock_queue.assert_called_once_with(minio_config, crate_id, root_path, profile_name, webhook_url, profiles_path)
 
 
 @pytest.mark.parametrize(

tests/test_services.py

@@ -22,7 +22,7 @@ def flask_app():
 # Test function: queue_ro_crate_validation_task
 
 @pytest.mark.parametrize(
-        "crate_id, rocrate_exists, minio_client, delay_side_effects, payload, status_code, response_dict",
+        "crate_id, rocrate_exists, minio_client, delay_side_effects, payload, profiles_path, status_code, response_dict",
         [
             (
                 "crate123", True, "minio_client", None,
@@ -37,7 +37,9 @@ def flask_app():
                     "root_path": "base_path",
                     "webhook_url": "https://webhook.example.com",
                     "profile_name": "default"
-                }, 202, {"message": "Validation in progress"}
+                },
+                None,
+                202, {"message": "Validation in progress"}
             ),
             (
                 "crate123", True, "minio_client", Exception("Celery down"),
@@ -52,7 +54,9 @@ def flask_app():
                     "root_path": "base_path",
                     "webhook_url": "https://webhook.example.com",
                     "profile_name": "default"
-                }, 500, {"error": "Celery down"}
+                },
+                None,
+                500, {"error": "Celery down"}
             ),
         ],
         ids=["successful_queue", "celery_server_down"]
@@ -65,7 +69,7 @@ def test_queue_ro_crate_validation_task(
     mock_exists,
     mock_delay,
     flask_app: FlaskClient, crate_id: str, rocrate_exists: bool, minio_client: str,
-    delay_side_effects: Exception, payload: dict, status_code: int, response_dict: dict
+    delay_side_effects: Exception, payload: dict, profiles_path: str, status_code: int, response_dict: dict
 ):
     mock_delay.side_effect = delay_side_effects
     mock_exists.return_value = rocrate_exists
@@ -76,11 +80,12 @@ def test_queue_ro_crate_validation_task(
     profile_name = payload["profile_name"] if "profile_name" in payload else None
     webhook_url = payload["webhook_url"] if "webhook_url" in payload else None
 
-    response, status_code = queue_ro_crate_validation_task(minio_config, crate_id, root_path, profile_name, webhook_url)
+    response, status_code = queue_ro_crate_validation_task(minio_config, crate_id, root_path,
+                                                           profile_name, webhook_url, profiles_path)
 
     mock_client.assert_called_once_with(minio_config)
     mock_exists.assert_called_once_with(minio_client, minio_config["bucket"], crate_id, root_path)
-    mock_delay.assert_called_once_with(minio_config, crate_id, root_path, profile_name, webhook_url)
+    mock_delay.assert_called_once_with(minio_config, crate_id, root_path, profile_name, webhook_url, profiles_path)
     assert status_code == status_code
     assert response.json == response_dict
 

tests/test_validation_tasks.py

@@ -17,7 +17,7 @@
 
 @pytest.mark.parametrize(
         "minio_config, crate_id, os_path_exists, os_path_isfile, os_path_isdir, " +
-        "return_value, webhook, profile, val_success, val_result, minio_client",
+        "return_value, webhook, profile, profiles_path, val_success, val_result, minio_client",
         [
             (
                 {
@@ -28,7 +28,7 @@
                         "bucket": "test_bucket"
                 },
                 "crate123", True, True, False, "/tmp/crate.zip",
-                "https://example.com/hook", "profileA", True, '{"status": "valid"}',
+                "https://example.com/hook", "profileA", None, True, '{"status": "valid"}',
                 "minio_client"
             ),
             (
@@ -40,7 +40,7 @@
                         "bucket": "test_bucket"
                 },
                 "crate123", True, False, True, "/tmp/crate123",
-                "https://example.com/hook", "profileA", True, '{"status": "valid"}',
+                "https://example.com/hook", "profileA", None, True, '{"status": "valid"}',
                 "minio_client"
             ),
             (
@@ -52,7 +52,7 @@
                         "bucket": "test_bucket"
                 },
                 "crate123", True, False, True, "/tmp/crate123",
-                None, "profileA", True, '{"status": "valid"}',
+                None, "profileA", None, True, '{"status": "valid"}',
                 "minio_client"
             ),
         ],
@@ -80,7 +80,7 @@ def test_process_validation(
     mock_rmtree,
     mock_client,
     minio_config: dict, crate_id: str, os_path_exists: bool, os_path_isfile: bool, os_path_isdir: bool,
-    return_value: str, webhook: str, profile: str, val_success: bool, val_result: str, minio_client: str
+    return_value: str, webhook: str, profile: str, profiles_path: str, val_success: bool, val_result: str, minio_client: str
 ):
     mock_exists.return_value = os_path_exists
     mock_isfile.return_value = os_path_isfile
@@ -93,11 +93,11 @@ def test_process_validation(
     mock_validation_result.to_json.return_value = val_result
     mock_validate.return_value = mock_validation_result
 
-    process_validation_task_by_id(minio_config, crate_id, "", profile, webhook)
+    process_validation_task_by_id(minio_config, crate_id, "", profile, webhook, profiles_path)
 
     mock_client.assert_called_once_with(minio_config)
     mock_fetch.assert_called_once_with(minio_client, minio_config["bucket"], crate_id, "")
-    mock_validate.assert_called_once_with(return_value, profile)
+    mock_validate.assert_called_once_with(return_value, profile, profiles_path=profiles_path)
     mock_update.assert_called_once_with(minio_client, minio_config["bucket"], crate_id, "", val_result)
     if webhook is not None:
         mock_webhook.assert_called_once_with(webhook, val_result)
@@ -113,7 +113,7 @@ def test_process_validation(
 
 @pytest.mark.parametrize(
         "minio_config, crate_id, os_path_exists, os_path_isfile, os_path_isdir, return_fetch, "
-        + "webhook, profile, return_validate, validate_side_effect, fetch_side_effect, minio_client",
+        + "webhook, profile, profiles_path, return_validate, validate_side_effect, fetch_side_effect, minio_client",
         [
             (
                 {
@@ -124,7 +124,7 @@ def test_process_validation(
                         "bucket": "test_bucket"
                 },
                 "crate123", True, True, False, "/tmp/crate.zip",
-                "https://example.com/hook", "profileA", "Validation failed", None, None,
+                "https://example.com/hook", "profileA", None, "Validation failed", None, None,
                 "minio_client"
             ),
             (
@@ -136,7 +136,7 @@ def test_process_validation(
                         "bucket": "test_bucket"
                 },
                 "crate123", True, True, False, "/tmp/crate.zip",
-                "https://example.com/hook", "profileA", None, Exception("Unexpected error"), None,
+                "https://example.com/hook", "profileA", None, None, Exception("Unexpected error"), None,
                 "minio_client"
             ),
             (
@@ -148,7 +148,7 @@ def test_process_validation(
                         "bucket": "test_bucket"
                 },
                 "crate123", False, False, False, None,
-                "https://example.com/hook", "profileA", None, None, Exception("MinIO fetch failed"),
+                "https://example.com/hook", "profileA", None, None, None, Exception("MinIO fetch failed"),
                 "minio_client"
             ),
         ],
@@ -177,7 +177,7 @@ def test_process_validation_failure(
     mock_rmtree,
     mock_client,
     minio_config: dict, crate_id: str, os_path_exists: bool, os_path_isfile: bool, os_path_isdir: bool,
-    return_fetch: str, webhook: str, profile: str, return_validate: str,
+    return_fetch: str, webhook: str, profile: str, profiles_path: str, return_validate: str,
     validate_side_effect: Exception, fetch_side_effect: Exception, minio_client: str
 ):
     mock_exists.return_value = os_path_exists
@@ -195,10 +195,10 @@ def test_process_validation_failure(
     else:
         mock_validate.side_effect = validate_side_effect
 
-    process_validation_task_by_id(minio_config, crate_id, "", profile, webhook)
+    process_validation_task_by_id(minio_config, crate_id, "", profile, webhook, profiles_path)
 
     if fetch_side_effect is None:
-        mock_validate.assert_called_once_with(return_fetch, profile)
+        mock_validate.assert_called_once_with(return_fetch, profile, profiles_path=profiles_path)
     else:
         mock_validate.assert_not_called()