opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16120 from mvdbeek/dce_resume

Browse Source 
[23.0] Extract HDA for code_file validate_input hook
This commit is contained in:
Björn Grüning
2023-05-20 15:59:12 +02:00
committed by GitHub
parent 763b1daef9 13e26671f1
commit 024d94fe20
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/__init__.py
+6 -1
View File
@@ -1809,7 +1809,12 @@ class Tool(Dictifiable):
# If the tool provides a `validate_input` hook, call it.
validate_input = self.get_hook("validate_input")
if validate_input:
validate_input(request_context, errors, params, self.inputs)
# hooks are so terrible ... this is specifically for https://github.com/galaxyproject/tools-devteam/blob/main/tool_collections/gops/basecoverage/operation_filter.py
legacy_non_dce_params = {
k: v.hda if isinstance(v, model.DatasetCollectionElement) and v.hda else v
for k, v in params.items()
}
validate_input(request_context, errors, legacy_non_dce_params, self.inputs)
all_errors.append(errors)
all_params.append(params)
unset_dataset_matcher_factory(request_context)
lib/galaxy_test/api/test_workflows.py
+3 -3
View File
@@ -1570,14 +1570,14 @@ test_data:
wait=True,
)
history_contents = self.dataset_populator._get_contents_request(history_id=history_id).json()
first_input = history_contents[1]
assert first_input["history_content_type"] == "dataset"
input_collection = self.dataset_populator.get_history_collection_details(history_id, hid=1, assert_ok=False)
first_input = input_collection["elements"][0]
paused_dataset = history_contents[-1]
failed_dataset = self.dataset_populator.get_history_dataset_details(history_id, hid=5, assert_ok=False)
assert paused_dataset["state"] == "paused", paused_dataset
assert failed_dataset["state"] == "error", failed_dataset
inputs = {
"input1": {"values": [{"src": "hda", "id": first_input["id"]}]},
"input1": {"values": [{"src": "dce", "id": first_input["id"]}]},
"failbool": "false",
"rerun_remap_job_id": failed_dataset["creating_job"],
}