TEST: Move use_validator fixture into conftest, simplify

Author: effigies

pydra/engine/tests/conftest.py

@@ -1,4 +1,5 @@
 import pytest
+from pydra import set_input_validator
 
 try:
     import importlib_resources
@@ -13,3 +14,10 @@ def data_tests_dir():
     )
     with importlib_resources.as_file(test_nii) as path:
         yield path
+
+
+@pytest.fixture()
+def use_validator():
+    set_input_validator(flag=True)
+    yield None
+    set_input_validator(flag=False)

pydra/engine/tests/utils.py

@@ -10,7 +10,6 @@
 from ..submitter import Submitter
 from ... import mark
 from ..specs import File
-from ... import set_input_validator
 
 need_docker = pytest.mark.skipif(
     shutil.which("docker") is None or sp.call(["docker", "info"]),
@@ -297,13 +296,3 @@ def gen_basic_wf_with_threadcount_concurrent(name="basic-wf-with-threadcount"):
     wf.add(fun_addvar(name="task2", a=wf.task1_1.lzout.out, b=2))
     wf.set_output([("out1", wf.task2.lzout.out), ("out2", wf.task1_2.lzout.out)])
     return wf
-
-
-@pytest.fixture(scope="function")
-def use_validator(request):
-    set_input_validator(flag=True)
-
-    def fin():
-        set_input_validator(flag=False)
-
-    request.addfinalizer(fin)