Fix remaining integration-tests

bopen · Mar 6, 2024 · 5ddc781 · 5ddc781
1 parent c38cf85
commit 5ddc781
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/tests/integration_test_40_cdsapi_seasonal_ecmwf.py b/tests/integration_test_40_cdsapi_seasonal_ecmwf.py
@@ -50,7 +50,7 @@ def test_compare_chunked_no_chunked() -> None:
 
     assert ds1.chunks["time"] == (1, 1, 1, 1)
 
-    res1 = ds1.data_vars["2m_temperature"].load()
+    res1 = ds1.data_vars["t2m"].load()
 
     ds2 = xr.open_dataset(
         REQUEST,  # type: ignore
@@ -61,14 +61,14 @@ def test_compare_chunked_no_chunked() -> None:
 
     assert ds2.chunks["time"] == (1, 1, 1, 1)
 
-    res2 = ds2.data_vars["2m_temperature"].load()
+    res2 = ds2.data_vars["t2m"].load()
 
     ds0 = xr.open_dataset(
         REQUEST,  # type: ignore
         engine="ecmwf",
         chunks={},
     )
-    res0 = ds0.data_vars["2m_temperature"].load()
+    res0 = ds0.data_vars["t2m"].load()
 
     assert (res0 - res1).shape == res0.shape
     assert (res0 == res1).all()
@@ -84,7 +84,7 @@ def test_cds_seasonal_single_time() -> None:
         request_chunks={"leadtime_hour": 1, "day": 1},
         chunks={},
     )
-    da1 = ds1.data_vars["2m_temperature"]
+    da1 = ds1.data_vars["t2m"]
     res1 = da1.sel(time="2023-08-01T00:00").load()
 
     assert isinstance(res1, xr.DataArray)
@@ -94,7 +94,7 @@ def test_cds_seasonal_single_time() -> None:
         engine="ecmwf",
         chunks={},
     )
-    res0 = ds0.data_vars["2m_temperature"].sel(time="2023-08-01T00:00").load()
+    res0 = ds0.data_vars["t2m"].sel(time="2023-08-01T00:00").load()
 
     assert (res0 - res1).shape == res0.shape
     assert (res0 == res1).all()
@@ -107,13 +107,13 @@ def test_cds_seasonal_small_slice_time() -> None:
         request_chunks={"leadtime_hour": 1, "day": 1},
         chunks={},
     )
-    da1 = ds1.data_vars["2m_temperature"]
+    da1 = ds1.data_vars["t2m"]
     res1 = da1.sel(time="2023-08-01").load()
 
     assert isinstance(res1, xr.DataArray)
 
     ds0 = xr.open_dataset(REQUEST, engine="ecmwf", chunks={})  # type: ignore
-    res0 = ds0.data_vars["2m_temperature"].sel(time="2023-08-01").load()
+    res0 = ds0.data_vars["t2m"].sel(time="2023-08-01").load()
 
     assert (res0 - res1).shape == res0.shape
     assert (res0 == res1).all()
@@ -126,7 +126,7 @@ def test_cds_seasonal_small_slice_time_and_step() -> None:
         request_chunks={"leadtime_hour": 1, "day": 1},
         chunks={},
     )
-    da = ds.data_vars["2m_temperature"]
+    da = ds.data_vars["t2m"]
     res = da.sel(time="2023-08-01", step=np.timedelta64(36, "h")).mean().compute()
 
     assert isinstance(res, xr.DataArray)
@@ -140,7 +140,7 @@ def test_cds_seasonal_big_slice_time() -> None:
         request_chunks={"leadtime_hour": 1, "day": 1},
         chunks={},
     )
-    da = ds.data_vars["2m_temperature"]
+    da = ds.data_vars["t2m"]
 
     res = da.sel(time=slice("2022-07-02", "2022-07-03")).mean().compute()
 

diff --git a/tests/integration_test_40_ecmwf_opendata_oper.py b/tests/integration_test_40_ecmwf_opendata_oper.py
@@ -35,17 +35,17 @@ def test_compare_chunked_no_chunked_values() -> None:
         request_chunks={"step": 1},
         chunks={},
     )
-    res1 = ds1.data_vars["2t"].load()
+    res1 = ds1.data_vars["t2m"].load()
 
     ds2 = xr.open_dataset(
         REQUEST,  # type: ignore
         engine="ecmwf",
         client="ecmwf-opendata",
         chunks={},
     )
-    res2 = ds2.data_vars["2t"].load()
+    res2 = ds2.data_vars["t2m"].load()
 
-    assert (res1 - res2).shape == (2, 3, 451, 900)
+    assert (res1 - res2).shape == (2, 3, 721, 1440)
     assert (res1 == res2).all()
 
 
@@ -57,7 +57,7 @@ def test_cds_era5_single_time() -> None:
         chunks={},
         request_chunks={"step": 1},
     )
-    da = ds.data_vars["2t"]
+    da = ds.data_vars["t2m"]
 
     time = datetime.date.today() - datetime.timedelta(days=1)
     res = da.sel(time=f"{time}T00:00").compute()
@@ -78,7 +78,7 @@ def test_cds_era5_small_slice_time() -> None:
         chunks={},
         request_chunks={"step": 1},
     )
-    da = ds.data_vars["2t"]
+    da = ds.data_vars["t2m"]
 
     time = datetime.date.today() - datetime.timedelta(days=1)
     res = da.sel(time=f"{time}").compute()
@@ -100,7 +100,7 @@ def test_cds_era5_small_step() -> None:
         chunks={},
         request_chunks={"step": 1},
     )
-    da = ds.data_vars["2t"]
+    da = ds.data_vars["t2m"]
 
     datetime.date.today() - datetime.timedelta(days=1)
     res = da.sel(step=datetime.timedelta(hours=12)).compute()
@@ -121,7 +121,7 @@ def test_cds_era5_small_slice_step() -> None:
         chunks={},
         request_chunks={"step": 1},
     )
-    da = ds.data_vars["2t"]
+    da = ds.data_vars["t2m"]
 
     datetime.date.today() - datetime.timedelta(days=1)
 
@@ -143,14 +143,14 @@ def test_compare_chunked_no_chunked() -> None:
         request_chunks={"step": 1},
         chunks={},
     )
-    res1 = ds1.data_vars["2t"].load()
+    res1 = ds1.data_vars["t2m"].load()
 
     ds2 = xr.open_dataset(
         REQUEST,  # type: ignore
         engine="ecmwf",
         client="ecmwf-opendata",
         chunks={},
     )
-    res2 = ds2.data_vars["2t"].load()
+    res2 = ds2.data_vars["t2m"].load()
 
     assert res1.equals(res2)
diff --git a/tests/integration_test_50_ecmwf_opendata_enfo.py b/tests/integration_test_50_ecmwf_opendata_enfo.py
@@ -47,7 +47,7 @@ def test_compare_chunked_no_chunked_values() -> None:
     )
     res0 = ds0.data_vars["msl"].load()
 
-    assert (res1 - res0).shape == (2, 3, 2, 451, 900)
+    assert (res1 - res0).shape == (2, 3, 2, 721, 1440)
     assert (res1 == res0).all()