resolving conflict

Author: djarecka

pydra/engine/tests/test_submitter.py

@@ -196,7 +196,7 @@ def test_slurm_wf_state(tmpdir):
 
 
 @pytest.mark.skipif(not slurm_available, reason="slurm not installed")
-@pytest.mark.flaky(reruns=2)
+@pytest.mark.flaky(reruns=3)
 def test_slurm_max_jobs(tmpdir):
     wf = Workflow("new_wf", input_spec=["x", "y"], cache_dir=tmpdir)
     wf.inputs.x = 5