Skip to content

Commit ba62fc8

Browse files
committed
add minio client to return ro-crate validation
1 parent 12b729e commit ba62fc8

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

app/tasks/validation_tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,19 @@ def check_validation_exists(
242242

243243

244244
def return_ro_crate_validation(
245+
minio_client: object,
245246
bucket_name: str,
246247
crate_id: str,
247248
root_path: str,
248249
) -> dict | str:
249250
"""
250251
Retrieves the validation result for an RO-Crate using the provided Crate ID.
251252
253+
:param minio_client: The MinIO client
252254
:param crate_id: The ID of the RO-Crate that has been validated
253255
:return: The validation result
254256
"""
255257

256258
logging.info(f"Fetching validation result for RO-Crate {crate_id}")
257259

258-
return get_validation_status_from_minio(bucket_name, crate_id, root_path)
260+
return get_validation_status_from_minio(minio_client, bucket_name, crate_id, root_path)

tests/test_validation_tasks.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,21 +385,21 @@ def test_return_validation_returns_dict(mock_get_status):
385385
# Simulate dict result
386386
mock_get_status.return_value = {"status": "passed", "errors": []}
387387

388-
result = return_ro_crate_validation("test_bucket", "crate123", None)
388+
result = return_ro_crate_validation("minio_client", "test_bucket", "crate123", None)
389389
assert isinstance(result, dict)
390390
assert result["status"] == "passed"
391-
mock_get_status.assert_called_once_with("test_bucket", "crate123", None)
391+
mock_get_status.assert_called_once_with("minio_client", "test_bucket", "crate123", None)
392392

393393

394394
@mock.patch("app.tasks.validation_tasks.get_validation_status_from_minio")
395395
def test_return_validation_returns_string(mock_get_status):
396396
# Simulate string result
397397
mock_get_status.return_value = "Validation result: OK"
398398

399-
result = return_ro_crate_validation("test_bucket", "crate456", None)
399+
result = return_ro_crate_validation("minio_client", "test_bucket", "crate456", None)
400400
assert isinstance(result, str)
401401
assert "OK" in result
402-
mock_get_status.assert_called_once_with("test_bucket", "crate456", None)
402+
mock_get_status.assert_called_once_with("minio_client", "test_bucket", "crate456", None)
403403

404404

405405
@mock.patch("app.tasks.validation_tasks.get_validation_status_from_minio")
@@ -408,10 +408,10 @@ def test_return_validation_raises_error(mock_get_status):
408408
mock_get_status.side_effect = InvalidAPIUsage("MinIO S3 Error: empty", 500)
409409

410410
with pytest.raises(InvalidAPIUsage) as exc_info:
411-
return_ro_crate_validation("test_bucket", "crate789", None)
411+
return_ro_crate_validation("minio_client", "test_bucket", "crate789", None)
412412

413413
assert "MinIO S3 Error" in str(exc_info.value.message)
414-
mock_get_status.assert_called_once_with("test_bucket", "crate789", None)
414+
mock_get_status.assert_called_once_with("minio_client", "test_bucket", "crate789", None)
415415

416416

417417
# Test function: check_ro_crate_exists

0 commit comments

Comments
 (0)