Skip to content
Snippets Groups Projects
Commit c06a7a8e authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

don't create artifacts tars for curation

parent 6dd3b489
No related branches found
No related tags found
3 merge requests!1606catch 2.8.3 up with main,!1605Merge 2.8.2.3 work to main,!1601don't create artifacts tars for curation
Pipeline #14646 failed
......@@ -300,16 +300,16 @@ def test_manifest_full_curation_image(use_file_list: bool, ingest_path: Path, al
ingest_artifacts_tar = find_ingestion_artifacts_tar(manifest_destination_dir)
ingest_artifacts_candidates = [ap for ap in aps if ap.filename == ingest_artifacts_tar.name]
assert len(ingest_artifacts_candidates) == 1
assert ingest_artifacts_candidates[0].type == AncillaryProductType.INGESTION_ARTIFACTS
"""
The ingestion_artifacts tar should contain ONLY the ingestion manifest
"""
with tarfile.open(ingest_artifacts_tar, "r") as tar:
members = tar.getmembers()
assert len(members) == 1
for member in members:
assert member.name.endswith(CURATOR_MANIFEST_FILENAME)
assert len(ingest_artifacts_candidates) == 0
# assert ingest_artifacts_candidates[0].type == AncillaryProductType.INGESTION_ARTIFACTS
# """
# The ingestion_artifacts tar should contain ONLY the ingestion manifest
# """
# with tarfile.open(ingest_artifacts_tar, "r") as tar:
# members = tar.getmembers()
# assert len(members) == 1
# for member in members:
# assert member.name.endswith(CURATOR_MANIFEST_FILENAME)
# Inspect the manifest's JSON dict
"""
......@@ -341,14 +341,12 @@ def test_manifest_full_curation_image(use_file_list: bool, ingest_path: Path, al
for ap_json in ap_jsons:
filename = ap_json["filename"]
if filename.endswith(TARFILE_EXT):
if filename.startswith(AncillaryProductType.INGESTION_ARTIFACTS.value) or filename.startswith(
AncillaryProductType.PIPELINE_ARTIFACTS.value
):
if filename.startswith(AncillaryProductType.PIPELINE_ARTIFACTS.value):
filenames_found.append(filename)
elif filename == WEBLOG_FILENAME:
filenames_found.append(filename)
assert len(filenames_found) == 3
assert len(filenames_found) == 2
# Check that manifest file exists on disk
with open(actual_manifest_file) as f:
......@@ -389,8 +387,8 @@ def test_manifest_full_curation_image(use_file_list: bool, ingest_path: Path, al
sorted(expected_aps, key=PRODUCT_SORT_KEY), sorted(actual_aps, key=PRODUCT_SORT_KEY)
):
assert expected_ap["type"] == actual_ap["type"]
if expected_ap["type"] != AncillaryProductType.INGESTION_ARTIFACTS.value:
assert expected_ap["filename"] == actual_ap["filename"]
# if expected_ap["type"] != AncillaryProductType.INGESTION_ARTIFACTS.value:
# assert expected_ap["filename"] == actual_ap["filename"]
def test_reingest_block_json_well_formed_partial_curation():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment