Adjusted tests to account for different type of exception.

biosimulators · Sep 24, 2024 · e883234 · e883234
1 parent beeda7c
commit e883234
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/biosimulators_utils/sedml/exec.py b/biosimulators_utils/sedml/exec.py
@@ -407,7 +407,8 @@ def exec_task(task, variables, preprocessed_task=None, log=None, config=None, **
         if str(e) != "":
             exceptions.append(e)
         msg = 'The SED document did not execute successfully:\n\n  {}'.format(
-            '\n\n  '.join(str(exceptions).replace('\n', '\n  ') for exceptions in exceptions))
+            '\n\n  '.join(str(exception.__class__) + ":" + str(exception).replace('\n', '\n  ')
+                          for exception in exceptions))
         raise SedmlExecutionError(msg)
     # return the results of the reports
     return report_results, log

diff --git a/tests/combine/test_combine_exec.py b/tests/combine/test_combine_exec.py
@@ -9,6 +9,7 @@
 from biosimulators_utils.sedml.data_model import (SedDocument, Task, Report, Model,
                                                   ModelLanguage, UniformTimeCourseSimulation, Algorithm, Variable, DataGenerator, DataSet)
 from biosimulators_utils.sedml import exec as sedml_exec
+from biosimulators_utils.sedml.exceptions import SedmlExecutionError
 from biosimulators_utils.sedml.io import SedmlSimulationReader, SedmlSimulationWriter
 from biosimulators_utils.viz.data_model import VizFormat
 from unittest import mock
@@ -428,7 +429,7 @@ def sed_task_executer_error(task, variables, log=None, config=None, preprocessed
 
         config.DEBUG = True
         sed_doc_executer = functools.partial(sedml_exec.exec_sed_doc, sed_task_executer_error)
-        with self.assertRaisesRegex(ValueError, 'Big error'):
+        with self.assertRaisesRegex(SedmlExecutionError, 'Big error'):
             exec.exec_sedml_docs_in_archive(sed_doc_executer, archive_filename, out_dir,
                                             apply_xml_model_changes=False,
                                             config=config)
@@ -453,7 +454,7 @@ def sed_task_executer_error(task, variables, log=None, config=None, preprocessed
 
         config.DEBUG = True
         sed_doc_executer = functools.partial(sedml_exec.exec_sed_doc, sed_task_executer_error)
-        with self.assertRaisesRegex(ValueError, 'Big error'):
+        with self.assertRaisesRegex(SedmlExecutionError, 'Big error'):
             exec.exec_sedml_docs_in_archive(sed_doc_executer, archive_filename, out_dir,
                                             apply_xml_model_changes=False,
                                             config=config)