Skip to content

Commit 4da0a35

Browse files
committed
TEST: Move use_validator fixture into conftest, simplify
1 parent 562349a commit 4da0a35

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

pydra/engine/tests/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
from pydra import set_input_validator
23

34
try:
45
import importlib_resources
@@ -13,3 +14,10 @@ def data_tests_dir():
1314
)
1415
with importlib_resources.as_file(test_nii) as path:
1516
yield path
17+
18+
19+
@pytest.fixture()
20+
def use_validator():
21+
set_input_validator(flag=True)
22+
yield None
23+
set_input_validator(flag=False)

pydra/engine/tests/utils.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from ..submitter import Submitter
1111
from ... import mark
1212
from ..specs import File
13-
from ... import set_input_validator
1413

1514
need_docker = pytest.mark.skipif(
1615
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"):
297296
wf.add(fun_addvar(name="task2", a=wf.task1_1.lzout.out, b=2))
298297
wf.set_output([("out1", wf.task2.lzout.out), ("out2", wf.task1_2.lzout.out)])
299298
return wf
300-
301-
302-
@pytest.fixture(scope="function")
303-
def use_validator(request):
304-
set_input_validator(flag=True)
305-
306-
def fin():
307-
set_input_validator(flag=False)
308-
309-
request.addfinalizer(fin)

0 commit comments

Comments
 (0)