Merge pull request #603 from djarecka/graph_test

Graph test

Author: djarecka

pydra/engine/task.py

@@ -686,7 +686,7 @@ class DockerTask(ContainerTask):
 
     def __init__(
         self,
-        name,
+        name=None,
         audit_flags: AuditFlag = AuditFlag.NONE,
         cache_dir=None,
         input_spec: ty.Optional[SpecInfo] = None,
@@ -769,6 +769,7 @@ class SingularityTask(ContainerTask):
 
     def __init__(
         self,
+        name=None,
         audit_flags: AuditFlag = AuditFlag.NONE,
         cache_dir=None,
         input_spec: ty.Optional[SpecInfo] = None,
@@ -808,6 +809,7 @@ def __init__(
                     name="Inputs", fields=[], bases=(SingularitySpec,)
                 )
             super().__init__(
+                name=name,
                 input_spec=input_spec,
                 output_spec=output_spec,
                 audit_flags=audit_flags,

pydra/engine/tests/test_workflow.py

@@ -4192,6 +4192,7 @@ def test_wf_upstream_error2(plugin, tmpdir):
     assert "raised an error" in str(excinfo.value)
 
 
+@pytest.mark.flaky(reruns=2)  # when slurm
 def test_wf_upstream_error3(plugin, tmpdir):
     """task2 dependent on task1, task1 errors, task-level split on task 1
     goal - workflow finish running, one output errors but the other doesn't
@@ -4455,13 +4456,15 @@ def exporting_graphs(wf, name):
     print("\n pdf of the detailed graph in: ", formatted_dot[0])
 
 
-def test_graph_1(tmpdir):
+@pytest.mark.parametrize("splitter", [None, "x"])
+def test_graph_1(tmpdir, splitter):
     """creating a set of graphs, wf with two nodes"""
     wf = Workflow(name="wf", input_spec=["x", "y"], cache_dir=tmpdir)
     wf.add(multiply(name="mult_1", x=wf.lzin.x, y=wf.lzin.y))
     wf.add(multiply(name="mult_2", x=wf.lzin.x, y=wf.lzin.x))
     wf.add(add2(name="add2", x=wf.mult_1.lzout.out))
     wf.set_output([("out", wf.add2.lzout.out)])
+    wf.split(splitter)
 
     # simple graph
     dotfile_s = wf.create_dotfile()