refactor n_threads fixtures (#574)

Author: slayoo

tests/smoke_tests/timing/fixtures.py renamed to tests/smoke_tests/timing/conftest.py

@@ -14,8 +14,8 @@
     pass
 
 
-@pytest.fixture(params=__num_threads)
-def num_threads(request):
+@pytest.fixture(params=__num_threads, name="num_threads")
+def num_threads_fixture(request):
     """pytest fixture providing thread-pool size for tests: single-thread case
     for setups in which Numba reports no parallel support, and single-
     as well as multi-threaded test runs otherwise. For the multi-threaded

tests/smoke_tests/timing/test_timing_2d.py

@@ -7,11 +7,6 @@
 from PyMPDATA import Options, ScalarField, Solver, Stepper, VectorField
 from PyMPDATA.boundary_conditions import Periodic
 
-from .fixtures import num_threads
-
-assert hasattr(num_threads, "_pytestfixturefunction")
-
-
 GRID = (126, 101)
 
 TIMESTEP = 0.1

tests/smoke_tests/timing/test_timing_3d.py

@@ -6,10 +6,6 @@
 
 from PyMPDATA import Options
 
-from .fixtures import num_threads
-
-assert hasattr(num_threads, "_pytestfixturefunction")
-
 
 @pytest.mark.parametrize(
     "options",

tests/unit_tests/fixtures/n_threads.py renamed to tests/unit_tests/conftest.py

@@ -9,6 +9,6 @@
     __n_threads = (1,)
 
 
-@pytest.fixture(params=__n_threads)
-def n_threads(request):
+@pytest.fixture(params=__n_threads, name="n_threads")
+def n_threads_fixture(request):
     return request.param

tests/unit_tests/fixtures/__init__.py

@@ -23,9 +23,6 @@
 )
 from PyMPDATA.impl.meta import META_HALO_VALID
 from PyMPDATA.impl.traversals import Traversals
-from tests.unit_tests.fixtures.n_threads import n_threads
-
-assert hasattr(n_threads, "_pytestfixturefunction")
 
 jit_flags = Options().jit_flags
 

tests/unit_tests/test_traversals.py

@@ -10,10 +10,6 @@
 from PyMPDATA.boundary_conditions import Periodic
 from PyMPDATA.impl.enumerations import INNER, MAX_DIM_NUM, MID3D, OUTER
 from PyMPDATA.impl.traversals import Traversals
-from tests.unit_tests.fixtures.n_threads import n_threads
-
-assert hasattr(n_threads, "_pytestfixturefunction")
-
 
 LEFT, RIGHT = "left", "right"
 ALL = (None, None)