Update to fix inconsistency due to modified 'cmip5-al33' datastore

ACCESS-NRI · Feb 10, 2025 · f2f8f8c · f2f8f8c
1 parent f3a30be
commit f2f8f8c
Showing 1 changed file with 67 additions and 56 deletions.
diff --git a/tests/e2e/test_end_to_end.py b/tests/e2e/test_end_to_end.py
@@ -73,7 +73,7 @@ def test_datastore_found(metacat, name):
 @pytest.mark.parametrize(
     "colname, expected",
     [
-        ("path", 3700255),
+        ("path", 3701323),
         ("file_type", 2),
         ("project", 3),
         ("institute", 62),
@@ -85,7 +85,7 @@ def test_datastore_found(metacat, name):
         ("ensemble", 240),
         ("version", 610),
         ("variable", 584),
-        ("time_range", 31152),
+        ("time_range", 31153),
         ("derived_variable", -999),
     ],
 )
@@ -147,7 +147,7 @@ def test_om2_datastore_nunique(metacat, colname, expected):
         (
             "institute",
             {
-                "BNU",
+                "NCAR",
                 "CMCC",
                 "IPSL",
                 "LASG-CESS",
@@ -162,16 +162,16 @@ def test_om2_datastore_nunique(metacat, colname, expected):
         (
             "model",
             {
-                "BNU-ESM",
-                "FGOALS-g2",
-                "FGOALS-s2",
-                "GISS-E2-H",
-                "GISS-E2-H-CC",
-                "GISS-E2-R",
-                "GISS-E2-R-CC",
-                "IPSL-CM5A-LR",
-                "IPSL-CM5A-MR",
-                "IPSL-CM5B-LR",
+                "CMCC-CMS",
+                "MRI-ESM1",
+                "CMCC-CESM",
+                "MRI-CGCM3",
+                "GEOS-5",
+                "HadGEM2-AO",
+                "MPI-ESM-LR",
+                "MPI-ESM-P",
+                "MPI-ESM-MR",
+                "CMCC-CM",
             },
         ),
         (
@@ -191,16 +191,16 @@ def test_om2_datastore_nunique(metacat, colname, expected):
         (
             "experiment",
             {
-                "amip",
-                "esmFdbk2",
-                "historical",
-                "midHolocene",
+                "decadal2005",
+                "decadal1966",
+                "decadal2006",
                 "piControl",
-                "rcp45",
-                "rcp85",
-                "sstClim",
-                "sstClimAerosol",
-                "sstClimSulfate",
+                "rcp26",
+                "decadal1980",
+                "decadal1977",
+                "decadal1975",
+                "historical",
+                "esmControl",
             },
         ),
         (
@@ -210,65 +210,76 @@ def test_om2_datastore_nunique(metacat, colname, expected):
         (
             "table",
             {
-                "6hrLev",
-                "6hrPlev",
                 "Amon",
-                "Lmon",
-                "OImon",
+                "day",
+                "cfSites",
+                "Oyr",
+                "6hrPlev",
                 "Omon",
+                "Lmon",
                 "cfDay",
-                "cfMon",
-                "day",
+                "OImon",
                 "fx",
             },
         ),
         (
             "ensemble",
             {
-                "r0i0p0",
-                "r11i1p1",
-                "r1i1p1",
-                "r1i1p2",
+                "r9i1p1",
+                "r10i1p1",
                 "r2i1p1",
-                "r3i1p1",
+                "r1i1p2",
+                "r1i1p1",
+                "r7i1p1",
                 "r4i1p1",
-                "r5i1p1",
                 "r6i1p1",
-                "r8i1p1",
+                "r3i1p1",
+                "r5i1p1",
             },
         ),
         (
             "version",
             {
-                "v1",
-                "v2",
-                "v20110726",
-                "v20111119",
-                "v20111219",
-                "v20120430",
-                "v20120526",
-                "v20120804",
-                "v20130506",
-                "v20161204",
+                "v20120308",
+                "v20120529",
+                "v20120315",
+                "v20111014",
+                "v20130815",
+                "v20120503",
+                "v20111122",
+                "v20120823",
+                "v20160324",
+                "v20111028",
             },
         ),
         (
             "variable",
-            {"ccb", "pr", "psl", "tas", "tasmax", "tasmin", "tro3", "ua", "va", "wmo"},
+            {
+                "chl",
+                "cli",
+                "hfx",
+                "va",
+                "evspsblveg",
+                "burntArea",
+                "mfo",
+                "mrso",
+                "ua",
+                "wap",
+            },
         ),
         (
             "time_range",
             {
-                "000101-010012",
-                "185001-234912",
-                "18520101-18521231",
-                "18780101-18781231",
-                "19170101-19171231",
-                "195001-200512",
-                "198201010000-198212311800",
-                "19910101-19911231",
-                "199201010000-199212311800",
-                "20010101-20011231",
+                "1880-1889",
+                "197601-198512",
+                "191001-191912",
+                "197801-198712",
+                "200601-201512",
+                "20450101-20451231",
+                "030101-040012",
+                "189001-189912",
+                "198101-201012",
+                "200701-201612",
             },
         ),
     ],