Merge pull request #5176 from neutrinoceros/tst/rewrite-test-for-pytest-8.4.0

Author: neutrinoceros

.github/workflows/bleeding-edge.yaml

@@ -54,7 +54,8 @@ jobs:
          --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
         python -m pip install --pre ewah-bool-utils
         python -m pip install git+https://github.com/yt-project/unyt.git
-        python -m pip install --pre pytest PyYAML
+        python -m pip install git+https://github.com/pytest-dev/pytest.git
+        python -m pip install --pre PyYAML
 
     - name: Build
       # --no-build-isolation is used to guarantee that build time dependencies
@@ -68,7 +69,7 @@ jobs:
     - name: Run Tests
       run: |
         yt config set --local yt log_level 50  # Disable excessive output
-        pytest -vvv --color=yes
+        pytest yt -vvv --color=yes
 
   create-issue:
     if: ${{ failure() && github.event_name == 'schedule' }}

.github/workflows/build-test.yaml

@@ -114,7 +114,7 @@ jobs:
       if: matrix.test-runner == 'pytest'
       run: |
         source .venv/${{matrix.venv-loc}}/activate
-        pytest --color=yes
+        pytest yt --color=yes
     - name: Run Tests (nose)
       if: matrix.test-runner == 'nose'
       run: |
@@ -152,7 +152,7 @@ jobs:
 
     - name: Run Image Tests
       run: |
-        pytest --color=yes --mpl -m mpl_image_compare \
+        pytest yt --color=yes --mpl -m mpl_image_compare \
                --mpl-generate-summary=html \
                --mpl-results-path=pytest_mpl_results \
                --mpl-baseline-path=tests/pytest_mpl_baseline \

yt/fields/tests/test_fields.py

@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 import numpy as np
 from numpy.testing import (
     assert_almost_equal,
@@ -8,6 +10,7 @@
 )
 
 from yt import load
+from yt.data_objects.static_output import Dataset
 from yt.frontends.stream.fields import StreamFieldInfo
 from yt.testing import (
     assert_allclose_units,
@@ -59,61 +62,15 @@ def _strip_ftype(field):
     return field[1]
 
 
-class TestFieldAccess:
-    description = None
-
-    def __init__(self, field_name, ds, nprocs):
-        # Note this should be a field name
-        self.field_name = field_name
-        self.description = f"Accessing_{field_name}_{nprocs}"
-        self.nprocs = nprocs
-        self.ds = ds
-
-    def __call__(self):
-        field = self.ds._get_field_info(self.field_name)
-        skip_grids = False
-        needs_spatial = False
-        for v in field.validators:
-            if getattr(v, "ghost_zones", 0) > 0:
-                skip_grids = True
-            if hasattr(v, "ghost_zones"):
-                needs_spatial = True
-
-        ds = self.ds
-
-        # This gives unequal sized grids as well as subgrids
-        dd1 = ds.all_data()
-        dd2 = ds.all_data()
-        sp = get_params(ds)
-        dd1.field_parameters.update(sp)
-        dd2.field_parameters.update(sp)
-        with np.errstate(all="ignore"):
-            v1 = dd1[self.field_name]
-            # No more conversion checking
-            assert_equal(v1, dd1[self.field_name])
-            if not needs_spatial:
-                with field.unit_registry(dd2):
-                    res = field._function(field, dd2)
-                    res = dd2.apply_units(res, field.units)
-                assert_array_almost_equal_nulp(v1, res, 4)
-            if not skip_grids:
-                for g in ds.index.grids:
-                    g.field_parameters.update(sp)
-                    v1 = g[self.field_name]
-                    g.clear_data()
-                    g.field_parameters.update(sp)
-                    r1 = field._function(field, g)
-                    if field.sampling_type == "particle":
-                        assert_equal(v1.shape[0], g.NumberOfParticles)
-                    else:
-                        assert_array_equal(r1.shape, v1.shape)
-                        for ax in "xyz":
-                            assert_array_equal(g["index", ax].shape, v1.shape)
-                    with field.unit_registry(g):
-                        res = field._function(field, g)
-                        assert_array_equal(v1.shape, res.shape)
-                        res = g.apply_units(res, field.units)
-                    assert_array_almost_equal_nulp(v1, res, 4)
+@dataclass(slots=True, frozen=True)
+class FieldAccessTestCase:
+    field_name: str
+    ds: Dataset
+    nprocs: int
+
+    @property
+    def description(self) -> str:
+        return f"Accessing_{self.field_name}_{self.nprocs}"
 
 
 def get_base_ds(nprocs):
@@ -188,7 +145,53 @@ def test_all_fields():
 
         for nprocs in [1, 4, 8]:
             test_all_fields.__name__ = f"{field}_{nprocs}"
-            yield TestFieldAccess(field, datasets[nprocs], nprocs)
+
+            tc = FieldAccessTestCase(field, datasets[nprocs], nprocs)
+
+            field = tc.ds._get_field_info(tc.field_name)
+            skip_grids = False
+            needs_spatial = False
+            for v in field.validators:
+                if getattr(v, "ghost_zones", 0) > 0:
+                    skip_grids = True
+                if hasattr(v, "ghost_zones"):
+                    needs_spatial = True
+
+            ds = tc.ds
+
+            # This gives unequal sized grids as well as subgrids
+            dd1 = ds.all_data()
+            dd2 = ds.all_data()
+            sp = get_params(ds)
+            dd1.field_parameters.update(sp)
+            dd2.field_parameters.update(sp)
+            with np.errstate(all="ignore"):
+                v1 = dd1[tc.field_name]
+                # No more conversion checking
+                assert_equal(v1, dd1[tc.field_name])
+                if not needs_spatial:
+                    with field.unit_registry(dd2):
+                        res = field._function(field, dd2)
+                        res = dd2.apply_units(res, field.units)
+                    assert_array_almost_equal_nulp(v1, res, 4)
+                if not skip_grids:
+                    for g in ds.index.grids:
+                        g.field_parameters.update(sp)
+                        v1 = g[tc.field_name]
+                        g.clear_data()
+                        g.field_parameters.update(sp)
+                        r1 = field._function(field, g)
+                        if field.sampling_type == "particle":
+                            assert_equal(v1.shape[0], g.NumberOfParticles)
+                        else:
+                            assert_array_equal(r1.shape, v1.shape)
+                            for ax in "xyz":
+                                assert_array_equal(g["index", ax].shape, v1.shape)
+                        with field.unit_registry(g):
+                            res = field._function(field, g)
+                            assert_array_equal(v1.shape, res.shape)
+                            res = g.apply_units(res, field.units)
+                        assert_array_almost_equal_nulp(v1, res, 4)
 
 
 def test_add_deposited_particle_field():