redid logic

Author: andrewelamb

synapseclient/models/curation.py

@@ -694,29 +694,36 @@ async def main():
         if delete_source:
             if not self.task_properties:
                 await self.get_async(synapse_client=synapse_client)
+
             if isinstance(self.task_properties, FileBasedMetadataTaskProperties):
                 if not self.task_properties.file_view_id:
                     raise ValueError(
-                        "file_view_id is required to delete the associated file view"
+                        "Cannot delete Fileview: "
+                        "'file_view_id' attribute is missing."
                     )
                 from synapseclient.models import EntityView
 
                 await EntityView(id=self.task_properties.file_view_id).delete_async(
                     synapse_client=synapse_client
                 )
+
             elif isinstance(self.task_properties, RecordBasedMetadataTaskProperties):
                 if not self.task_properties.record_set_id:
                     raise ValueError(
-                        "record_set_id is required to delete the associated record set"
+                        "Cannot delete RecordSet: "
+                        "'record_set_id' attribute is missing."
                     )
                 from synapseclient.models import RecordSet
 
                 await RecordSet(id=self.task_properties.record_set_id).delete_async(
                     synapse_client=synapse_client
                 )
+
             else:
                 raise ValueError(
-                    "Failed to retrieve task properties for deletion. Cannot delete source."
+                    "'task_property' attribute is None. "
+                    "Deletion only supports FileBasedMetadataTaskProperties or "
+                    "RecordBasedMetadataTaskProperties."
                 )
 
         await delete_curation_task(task_id=self.task_id, synapse_client=synapse_client)

tests/integration/synapseclient/models/async/test_curation_async.py

@@ -502,9 +502,6 @@ async def test_delete_file_based_curation_task_and_fileview_async(
         with pytest.raises(SynapseHTTPError):
             await CurationTask(task_id=task_id).get_async(synapse_client=self.syn)
 
-        print("##########")
-        print(entity_view.id)
-        print("##########")
         # AND the file view should be deleted and no longer retrievable
         with pytest.raises(SynapseHTTPError):
             await EntityView(entity_view.id).get_async(synapse_client=self.syn)