Fix tests

Author: BSchilperoort

era5cli/key_management.py

@@ -48,7 +48,7 @@ def attempt_cds_login(url: str, key: str) -> True:
                 "product_type": "reanalysis",
                 "date": "2012-12-01",
                 "time": "14:00",
-                "format": "netcdf",
+                "data_format": "netcdf",
             },
         )
         return True

tests/test_cli.py

@@ -35,7 +35,7 @@ def test_parse_args():
     assert not args.merge
     assert args.startyear == 2008
     assert args.statistics
-    assert not args.threads
+    assert args.threads == 1
     assert args.variables == ["total_precipitation"]
     assert args.land
     assert not args.area

tests/test_fetch.py

@@ -472,7 +472,8 @@ def test_build_request():
         "month": ALL_MONTHS,
         "day": ALL_DAYS,
         "time": ALL_HOURS,
-        "format": "netcdf",
+        "data_format": "netcdf",
+        "download_format": "unarchived",
     }
     assert request == req
 
@@ -486,7 +487,8 @@ def test_build_request():
         "product_type": "monthly_averaged_ensemble_members",
         "month": ALL_MONTHS,
         "time": ALL_HOURS,
-        "format": "netcdf",
+        "data_format": "netcdf",
+        "download_format": "unarchived",
     }
     assert request == req
 
@@ -503,7 +505,8 @@ def test_build_request():
         "product_type": "monthly_averaged_reanalysis",
         "month": ALL_MONTHS,
         "time": ["00:00"],
-        "format": "netcdf",
+        "data_format": "netcdf",
+        "download_format": "unarchived",
     }
     assert request == req
 

tests/test_integration.py

@@ -32,7 +32,8 @@ def my_thing_mock():
             '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00',
             '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00',
             '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'],
-            'format': 'netcdf', 'product_type': 'reanalysis', 'day': ['01',
+            'data_format': 'netcdf', 'download_format': 'unarchived',
+            'product_type': 'reanalysis', 'day': ['01',
             '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12',
             '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23',
             '24', '25', '26', '27', '28', '29', '30', '31']}
@@ -55,7 +56,8 @@ def my_thing_mock():
             '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00',
             '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00',
             '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'],
-            'format': 'netcdf', 'pressure_level': [1, 2, 3, 5, 7, 10, 20, 30,
+            'data_format': 'netcdf', 'download_format': 'unarchived',
+            'pressure_level': [1, 2, 3, 5, 7, 10, 20, 30,
             50, 70, 100, 125, 150, 175, 200, 225, 250, 300, 350, 400, 450, 500,
             550, 600, 650, 700, 750, 775, 800, 825, 850, 875, 900, 925, 950,
             975, 1000], 'product_type': 'reanalysis', 'day': ['01', '02', '03',
@@ -77,8 +79,8 @@ def my_thing_mock():
             """\
             reanalysis-era5-land-monthly-means {'variable': 'snow_cover',
             'year': 2008, 'month': ['01', '02', '03', '04', '05', '06', '07',
-            '08', '09', '10', '11', '12'], 'time': ['00:00'], 'format':
-            'netcdf', 'product_type': 'monthly_averaged_reanalysis'}
+            '08', '09', '10', '11', '12'], 'time': ['00:00'], 'data_format': 'netcdf',
+            'download_format': 'unarchived', 'product_type': 'monthly_averaged_reanalysis'}
             era5-land_snow_cover_2008_monthly.nc"""
         ),
     },