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

Fix expect_failure="true" failure semantics to cover tool submission failure.

Browse Source 
Previously it just covered runtime job failure - there should probably be a way for the tool developer to specify which sort of failure is expected.
This commit is contained in:
John Chilton
2015-07-31 11:09:44 +01:00
parent 6fadb2b50e
commit e8f3553404
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/test_toolbox.py
+16 -11
View File
@@ -44,6 +44,7 @@ class ToolTestCase( TwillTestCase ):
job_stdio = None
job_output_exceptions = None
tool_execution_exception = None
expected_failure_occurred = False
try:
try:
tool_response = galaxy_interactor.run_tool( testdef, test_history )
@@ -52,22 +53,26 @@ class ToolTestCase( TwillTestCase ):
except RunToolException as e:
tool_inputs = e.inputs
tool_execution_exception = e
raise e
if not testdef.expect_failure:
raise e
else:
expected_failure_occurred = True
except Exception as e:
tool_execution_exception = e
raise e
self.assertTrue( data_list or data_collection_list )
if not expected_failure_occurred:
self.assertTrue( data_list or data_collection_list )
try:
job_stdio = self._verify_outputs( testdef, test_history, jobs, shed_tool_id, data_list, data_collection_list, galaxy_interactor )
except JobOutputsError as e:
job_stdio = e.job_stdio
job_output_exceptions = e.output_exceptions
raise e
except Exception as e:
job_output_exceptions = [e]
raise e
try:
job_stdio = self._verify_outputs( testdef, test_history, jobs, shed_tool_id, data_list, data_collection_list, galaxy_interactor )
except JobOutputsError as e:
job_stdio = e.job_stdio
job_output_exceptions = e.output_exceptions
raise e
except Exception as e:
job_output_exceptions = [e]
raise e
finally:
job_data = {}
if tool_inputs is not None: