skip netcdf4 test in Linux CI >=1.6.5, clean up tests

xfail for netcdf4 in ubuntu CI

Author: DanielYang59

tests/io/abinit/test_netcdf.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import sys
 import tarfile
 
 import numpy as np
@@ -60,7 +61,6 @@ def test_read_si2(self):
             for varname, float_ref in ref_float_values.items():
                 value = data.read_value(varname)
                 assert_allclose(value, float_ref)
-            # assert 0
 
             # Reading non-existent variables or dims should raise
             # a subclass of NetcdReaderError
@@ -83,36 +83,31 @@ def test_read_si2(self):
             # xc = data.read_abinit_xcfunc()
             # assert xc == "LDA"
 
-    @pytest.mark.skipif(netCDF4 is None or True, reason="Requires Netcdf4")
-    def test_read_fe(self):
-        with tarfile.open(f"{TEST_DIR}/Fe_magmoms_collinear_GSR.tar.xz", mode="r:xz") as t:
+    @pytest.mark.skipif(netCDF4 is None, reason="Requires NetCDF4")
+    @pytest.mark.xfail(
+        sys.platform.startswith("linux") and os.getenv("CI") and netCDF4.__version__ >= "1.6.5",
+        reason="Fails with netCDF4 >= 1.6.5 on Ubuntu CI",
+    )
+    @pytest.mark.parametrize(
+        ("tarname", "expected"),
+        [
+            ("Fe_magmoms_collinear_GSR.tar.xz", [-0.5069359730980665]),
+            ("Fe_magmoms_noncollinear_GSR.tar.xz", [[0.357939487, 0.357939487, 0]]),
+        ],
+    )
+    def test_read_fe(self, tarname, expected):
+        with tarfile.open(os.path.join(TEST_DIR, tarname), mode="r:xz") as t:
             # TODO: remove attr check after only 3.12+
             if hasattr(tarfile, "data_filter"):
                 t.extractall(".", filter="data")
             else:
                 t.extractall(".")  # noqa: S202
 
-            ref_magmom_collinear = [-0.5069359730980665]
-            path = os.path.join(".", "Fe_magmoms_collinear_GSR.nc")
-
-            # TODO: PR4128, EtsfReader would fail in Ubuntu CI with netCDF4 > 1.6.5
-            # Need someone with knowledge in netCDF4 to fix it
-            with EtsfReader(path) as data:
-                structure = data.read_structure()
-                assert structure.site_properties["magmom"] == ref_magmom_collinear
-
-        with tarfile.open(f"{TEST_DIR}/Fe_magmoms_noncollinear_GSR.tar.xz", mode="r:xz") as t:
-            # TODO: remove attr check after only 3.12+
-            if hasattr(tarfile, "data_filter"):
-                t.extractall(".", filter="data")
-            else:
-                t.extractall(".")  # noqa: S202
-            ref_magmom_noncollinear = [[0.357939487, 0.357939487, 0]]
-            path = os.path.join(".", "Fe_magmoms_noncollinear_GSR.nc")
+            path = os.path.basename(tarname).replace(".tar.xz", ".nc")
 
             with EtsfReader(path) as data:
                 structure = data.read_structure()
-                assert structure.site_properties["magmom"] == ref_magmom_noncollinear
+                assert structure.site_properties["magmom"] == expected
 
 
 class TestAbinitHeader(MatSciTest):