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

Make a couple workflow invocation tests more robust.

Browse Source 
Less random sleeping, wait for actual invocation. I think this is likely the cause this transient failure (https://jenkins.galaxyproject.org/job/docker-api/8215/testReport/junit/api.test_workflows/WorkflowsApiTestCase/test_workflow_run_output_collection_mapping/) picking up the input as the last dataset in the history instead of the output - I bet the workflow just hadn't been invoked yet.
This commit is contained in:
John Chilton
2017-08-31 09:07:03 -04:00
parent bd13cadbdd
commit 5142509f13
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/test_workflows.py
+4 -4
View File
@@ -651,8 +651,8 @@ steps:
inputs = {
'0': self._ds_entry(hda1),
}
self.__invoke_workflow(history_id, workflow_id, inputs)
time.sleep(5)
invocation_id = self.__invoke_workflow(history_id, workflow_id, inputs)
self.wait_for_invocation_and_jobs(history_id, workflow_id, invocation_id)
self.dataset_populator.wait_for_history(history_id, assert_ok=True)
self.assertEqual("a\nc\nb\nd\n", self.dataset_populator.get_history_dataset_content(history_id, hid=0))
@@ -681,8 +681,8 @@ steps:
inputs = {
'0': self._ds_entry(hdca1),
}
self.__invoke_workflow(history_id, workflow_id, inputs)
time.sleep(5)
invocation_id = self.__invoke_workflow(history_id, workflow_id, inputs)
self.wait_for_invocation_and_jobs(history_id, workflow_id, invocation_id)
self.dataset_populator.wait_for_history(history_id, assert_ok=True)
self.assertEqual("a\nc\nb\nd\ne\ng\nf\nh\n", self.dataset_populator.get_history_dataset_content(history_id, hid=0))