Copy element_identifier to resumed job

This fixes #5269.
This commit is contained in:
mvdbeek
2018-01-05 17:32:09 +02:00
parent cc18db4e49
commit 2f6cc22384
3 changed files with 8 additions and 0 deletions
+3
View File
@@ -1017,6 +1017,9 @@ class JobParameter(object):
self.name = name
self.value = value
def copy(self):
return JobParameter(name=self.name, value=self.value)
class JobToInputDatasetAssociation(object):
def __init__(self, name, dataset):
+3
View File
@@ -531,6 +531,9 @@ class DefaultToolAction(object):
# Duplicate PJAs before remap.
for pjaa in old_job.post_job_actions:
current_job.add_post_job_action(pjaa.post_job_action)
for p in old_job.parameters:
if p.name.endswith('|__identifier__'):
current_job.parameters.append(p.copy())
remapped_hdas = {}
input_hdcas = set()
for jtod in old_job.output_datasets:
+2
View File
@@ -773,6 +773,8 @@ test_data:
assert_ok=True)
unpaused_dataset = self.dataset_populator.get_history_dataset_details(history_id, wait=True, assert_ok=False)
assert unpaused_dataset['state'] == 'ok'
contents = self.dataset_populator.get_history_dataset_content(history_id, hid=7, assert_ok=False)
assert contents == 'fail\nsuccess\n', contents
@skip_without_tool("collection_creates_pair")
def test_workflow_run_output_collection_mapping(self):