fixing the tests

Author: djarecka

pydra/engine/tests/test_workflow.py

@@ -2072,7 +2072,7 @@ def test_wf_nostate_cachelocations(plugin, tmpdir):
 
     # checking execution time (for unix and cf)
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         assert t1 > 2
         assert t2 < 0.5
 
@@ -2128,7 +2128,7 @@ def test_wf_nostate_cachelocations_a(plugin, tmpdir):
     assert 8 == results2.output.out
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking execution time (second one should be quick)
         assert t1 > 2
         # testing relative values (windows or slurm takes much longer to create wf itself)
@@ -2189,7 +2189,7 @@ def test_wf_nostate_cachelocations_b(plugin, tmpdir):
     assert 8 == results2.output.out == results2.output.out_pr
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -2247,7 +2247,7 @@ def test_wf_nostate_cachelocations_setoutputchange(plugin, tmpdir):
     assert 8 == results2.output.out2
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking execution time (the second wf should be fast, nodes do not have to rerun)
         assert t1 > 2
         # testing relative values (windows or slurm takes much longer to create wf itself)
@@ -2303,7 +2303,7 @@ def test_wf_nostate_cachelocations_setoutputchange_a(plugin, tmpdir):
     assert 8 == results2.output.out2
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking execution time (the second wf should be fast, nodes do not have to rerun)
         assert t1 > 2
         # testing relative values (windows or slurm takes much longer to create wf itself)
@@ -2361,7 +2361,7 @@ def test_wf_nostate_cachelocations_forcererun(plugin, tmpdir):
     assert 8 == results2.output.out
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking execution time
         assert t1 > 2
         assert t2 > 2
@@ -2427,7 +2427,7 @@ def test_wf_nostate_cachelocations_wftaskrerun_propagateTrue(plugin, tmpdir):
     assert len(list(Path(cache_dir2).glob("F*"))) == 2
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         assert t1 > 2
         assert t2 > 2
 
@@ -2486,10 +2486,10 @@ def test_wf_nostate_cachelocations_wftaskrerun_propagateFalse(plugin, tmpdir):
     assert wf2.output_dir.exists()
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the time
         assert t1 > 2
-        assert t2 > 2
+        assert t2 < 0.5
 
     # tasks should not be recomputed
     assert len(list(Path(cache_dir1).glob("F*"))) == 2
@@ -2545,18 +2545,18 @@ def test_wf_nostate_cachelocations_taskrerun_wfrerun_propagateFalse(plugin, tmpd
     results2 = wf2.result()
     assert 8 == results2.output.out
 
-    # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
-        # checking the execution time
-        assert t1 > 2
-        assert t2 > 2
-    # checking if the second wf doesn't runs again
     assert wf1.output_dir.exists()
     assert wf2.output_dir.exists()
     # the second task should be recomputed
     assert len(list(Path(cache_dir1).glob("F*"))) == 2
     assert len(list(Path(cache_dir2).glob("F*"))) == 1
 
+    # for win and dask/slurm the time for dir creation etc. might take much longer
+    if not sys.platform.startswith("win") and plugin == "cf":
+        # checking the execution time
+        assert t1 > 2
+        assert t2 > 2
+
 
 def test_wf_nostate_nodecachelocations(plugin, tmpdir):
     """
@@ -2569,15 +2569,13 @@ def test_wf_nostate_nodecachelocations(plugin, tmpdir):
 
     wf1 = Workflow(name="wf", input_spec=["x"], cache_dir=cache_dir1)
     wf1.add(ten(name="ten", x=wf1.lzin.x))
-    wf1.add(add2_wait(name="add2", x=wf1.ten.lzout.out))
+    wf1.add(add2(name="add2", x=wf1.ten.lzout.out))
     wf1.set_output([("out", wf1.add2.lzout.out)])
     wf1.inputs.x = 3
     wf1.plugin = plugin
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf1)
-    t1 = time.time() - t0
 
     results1 = wf1.result()
     assert 12 == results1.output.out
@@ -2589,24 +2587,17 @@ def test_wf_nostate_nodecachelocations(plugin, tmpdir):
         cache_locations=cache_dir1,
     )
     wf2.add(ten(name="ten", x=wf2.lzin.x))
-    wf2.add(add2_wait(name="add2", x=wf2.ten.lzout.out))
+    wf2.add(add2(name="add2", x=wf2.ten.lzout.out))
     wf2.set_output([("out", wf2.add2.lzout.out)])
     wf2.inputs.x = 2
     wf2.plugin = plugin
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf2)
-    t2 = time.time() - t0
 
     results2 = wf2.result()
     assert 12 == results2.output.out
 
-    # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
-        # checking the execution time
-        assert t1 > 2
-        assert t2 > 2
     # checking if the second wf runs again, but runs only one task
     assert wf1.output_dir.exists()
     assert wf2.output_dir.exists()
@@ -2626,41 +2617,32 @@ def test_wf_nostate_nodecachelocations_upd(plugin, tmpdir):
 
     wf1 = Workflow(name="wf", input_spec=["x"], cache_dir=cache_dir1)
     wf1.add(ten(name="ten", x=wf1.lzin.x))
-    wf1.add(add2_wait(name="add2", x=wf1.ten.lzout.out))
+    wf1.add(add2(name="add2", x=wf1.ten.lzout.out))
     wf1.set_output([("out", wf1.add2.lzout.out)])
     wf1.inputs.x = 3
     wf1.plugin = plugin
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf1)
-    t1 = time.time() - t0
 
     results1 = wf1.result()
     assert 12 == results1.output.out
 
     wf2 = Workflow(name="wf", input_spec=["x", "y"], cache_dir=cache_dir2)
     wf2.add(ten(name="ten", x=wf2.lzin.x))
-    wf2.add(add2_wait(name="add2", x=wf2.ten.lzout.out))
+    wf2.add(add2(name="add2", x=wf2.ten.lzout.out))
     wf2.set_output([("out", wf2.add2.lzout.out)])
     wf2.inputs.x = 2
     wf2.plugin = plugin
     # updating cache_locations after adding the tasks
     wf2.cache_locations = cache_dir1
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf2)
-    t2 = time.time() - t0
 
     results2 = wf2.result()
     assert 12 == results2.output.out
 
-    # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
-        # checking the execution time
-        assert t1 > 2
-        assert t2 > 2
     # checking if the second wf runs again, but runs only one task
     assert wf1.output_dir.exists()
     assert wf2.output_dir.exists()
@@ -2719,7 +2701,7 @@ def test_wf_state_cachelocations(plugin, tmpdir):
     assert results2[1].output.out == 82
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -2786,7 +2768,7 @@ def test_wf_state_cachelocations_forcererun(plugin, tmpdir):
     assert results2[1].output.out == 82
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 > 2
@@ -2855,7 +2837,7 @@ def test_wf_state_cachelocations_updateinp(plugin, tmpdir):
     assert results2[1].output.out == 82
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -2971,7 +2953,7 @@ def test_wf_nostate_cachelocations_updated(plugin, tmpdir):
     assert 8 == results2.output.out
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 > 2
@@ -2992,16 +2974,14 @@ def test_wf_nostate_cachelocations_recompute(plugin, tmpdir):
 
     wf1 = Workflow(name="wf", input_spec=["x", "y"], cache_dir=cache_dir1)
     wf1.add(multiply(name="mult", x=wf1.lzin.x, y=wf1.lzin.y))
-    wf1.add(add2_wait(name="add2", x=wf1.mult.lzout.out))
+    wf1.add(add2(name="add2", x=wf1.mult.lzout.out))
     wf1.set_output([("out", wf1.add2.lzout.out)])
     wf1.inputs.x = 2
     wf1.inputs.y = 3
     wf1.plugin = plugin
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf1)
-    t1 = time.time() - t0
 
     results1 = wf1.result()
     assert 8 == results1.output.out
@@ -3014,16 +2994,14 @@ def test_wf_nostate_cachelocations_recompute(plugin, tmpdir):
     )
     # different argument assigment
     wf2.add(multiply(name="mult", x=wf2.lzin.y, y=wf2.lzin.x))
-    wf2.add(add2_wait(name="add2", x=wf2.mult.lzout.out))
+    wf2.add(add2(name="add2", x=wf2.mult.lzout.out))
     wf2.set_output([("out", wf2.add2.lzout.out)])
     wf2.inputs.x = 2
     wf2.inputs.y = 3
     wf2.plugin = plugin
 
-    t0 = time.time()
     with Submitter(plugin=plugin) as sub:
         sub(wf2)
-    t2 = time.time() - t0
 
     results2 = wf2.result()
     assert 8 == results2.output.out
@@ -3032,12 +3010,6 @@ def test_wf_nostate_cachelocations_recompute(plugin, tmpdir):
     assert wf1.output_dir.exists()
     assert wf2.output_dir.exists()
 
-    # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
-        # checking the execution time
-        assert t1 > 2
-        assert t2 > 2
-
     # the second wf should have only one task run
     assert len(list(Path(cache_dir1).glob("F*"))) == 2
     assert len(list(Path(cache_dir2).glob("F*"))) == 1
@@ -3093,7 +3065,7 @@ def test_wf_ndstate_cachelocations(plugin, tmpdir):
     assert results2.output.out == [8, 82]
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -3157,7 +3129,7 @@ def test_wf_ndstate_cachelocations_forcererun(plugin, tmpdir):
     assert results2.output.out == [8, 82]
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 > 2
@@ -3219,7 +3191,7 @@ def test_wf_ndstate_cachelocations_updatespl(plugin, tmpdir):
     assert results2.output.out == [8, 82]
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -3282,7 +3254,7 @@ def test_wf_ndstate_cachelocations_recompute(plugin, tmpdir):
     assert results2.output.out == [8, 10, 62, 82]
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 > 2
@@ -3335,7 +3307,7 @@ def test_wf_nostate_runtwice_usecache(plugin, tmpdir):
     assert cache_dir_content == os.listdir(wf1.cache_dir)
 
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5
@@ -3384,7 +3356,7 @@ def test_wf_state_runtwice_usecache(plugin, tmpdir):
     # checking if no new directory is created
     assert cache_dir_content == os.listdir(wf1.cache_dir)
     # for win and dask/slurm the time for dir creation etc. might take much longer
-    if sys.platform.startswith("win") and plugin == "cf":
+    if not sys.platform.startswith("win") and plugin == "cf":
         # checking the execution time
         assert t1 > 2
         assert t2 < 0.5