Skip to content
Snippets Groups Projects
Commit 2df1c74e authored by Wout De Nolf's avatar Wout De Nolf
Browse files

make execute_graph uniform with the one from ewokscore

parent b23d4622
No related tags found
1 merge request!31Draft: make execute_graph uniform with the one from ewokscore
Pipeline #59764 failed
......@@ -547,16 +547,17 @@ class EwoksWorkflow(Workflow):
def execute_graph(
graph,
representation=None,
varinfo=None,
inputs=None,
raise_on_error=True,
varinfo=None,
timeout=None,
log_task_execution=False,
**load_options,
load_options: Optional[dict] = None,
**execute_options,
):
ewoksgraph = load_graph(source=graph, representation=representation, **load_options)
if load_options is None:
load_options = dict()
ewoksgraph = load_graph(source=graph, **load_options)
ppfgraph = EwoksWorkflow(
ewoksgraph, varinfo=varinfo, enable_logging=log_task_execution
)
return ppfgraph.run(inputs=inputs, raise_on_error=raise_on_error, timeout=timeout)
return ppfgraph.run(inputs=inputs, timeout=timeout, **execute_options)
......@@ -31,5 +31,5 @@ def test_workflow2(ppf_logging, tmpdir):
graph, expected = workflow2()
result = execute_graph(graph, varinfo=varinfo, raise_on_error=False)
assert_taskgraph_result(graph, expected, varinfo=varinfo)
err_msg = "Runtime error in pythonErrorHandlerTest.py!"
err_msg = "Task 'Python Error Handler Test' failed"
assert result["WorkflowException"]["errorMessage"] == err_msg
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment