crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 05:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include error message in exception when openmc.run fails

Browse source
This commit is contained in:
Paul Romano 2021-03-08 10:40:38 -06:00
parent 84d501e0b1
commit a367d27905
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
openmc/executor.py
View file

@ -25,8 +25,12 @@ def _run(args, output, cwd):
# Raise an exception if return status is non-zero
if p.returncode != 0:
raise subprocess.CalledProcessError(p.returncode, ' '.join(args),
''.join(lines))
# Get error message from output and simplify whitespace
output = ''.join(lines)
_, _, error_msg = output.partition('ERROR: ')
error_msg = ' '.join(error_msg.split())
raise RuntimeError(error_msg)
def plot_geometry(output=True, openmc_exec='openmc', cwd='.'):
@ -43,7 +47,7 @@ def plot_geometry(output=True, openmc_exec='openmc', cwd='.'):
Raises
------
subprocess.CalledProcessError
RuntimeError
If the `openmc` executable returns a non-zero status
"""
@ -70,7 +74,7 @@ def plot_inline(plots, openmc_exec='openmc', cwd='.', convert_exec='convert'):
Raises
------
subprocess.CalledProcessError
RuntimeError
If the `openmc` executable returns a non-zero status
"""
@ -133,7 +137,7 @@ def calculate_volumes(threads=None, output=True, cwd='.',
Raises
------
subprocess.CalledProcessError
RuntimeError
If the `openmc` executable returns a non-zero status
See Also
@ -188,7 +192,7 @@ def run(particles=None, threads=None, geometry_debug=False,
Raises
------
subprocess.CalledProcessError
RuntimeError
If the `openmc` executable returns a non-zero status
"""

4
tests/unit_tests/test_source_file.py
View file

@ -73,6 +73,6 @@ def test_wrong_source_attributes(run_in_tmpdir):
# When we run the model, it should error out with a message that includes
# the names of the wrong attributes
with pytest.raises(subprocess.CalledProcessError) as excinfo:
with pytest.raises(RuntimeError) as excinfo:
openmc.run()
assert 'platypus, axolotl, narwhal' in excinfo.value.output
assert 'platypus, axolotl, narwhal' in str(excinfo.value)