TST: test_coordinate_operation_grids__alternative_grid_name fixed to …

…network full_name behavior
pyproj4 · Jun 9, 2022 · 48b1460 · 48b1460
1 parent 289f8ef
commit 48b1460
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -66,7 +66,7 @@ def grids_available(*grid_names, check_network=True, check_all=False):
     """
     Check if the grids are available
     """
-    if check_network and os.environ.get("PROJ_NETWORK") == "ON":
+    if check_network and pyproj.network.is_network_enabled():
         return True
     available = [
         (

diff --git a/test/crs/test_crs.py b/test/crs/test_crs.py
@@ -611,12 +611,12 @@ def test_coordinate_operation_grids__alternative_grid_name():
     assert grid.direct_download is True
     assert grid.open_license is True
     assert grid.short_name == "ca_nrc_ntv1_can.tif"
-    if grids_available(grid.short_name):
+    if PROJ_GTE_91 and pyproj.network.is_network_enabled():
         assert grid.available is True
-        if PROJ_GTE_91:
-            assert grid.full_name == ""
-        else:
-            assert grid.full_name.endswith(grid.short_name)
+        assert grid.full_name == ""
+    elif grids_available(grid.short_name):
+        assert grid.available is True
+        assert grid.full_name.endswith(grid.short_name)
     else:
         assert grid.available is False
         assert grid.full_name == ""