Sort missing years in "No input data available for years" message (#1225)

ledm · Javier Vegas-Regidor · web-flow · commit 2a0bb11cb52d · 2021-07-14T15:06:54.000+02:00
* added a sorted print statement.

* Update esmvalcore/_recipe_checks.py

* Update esmvalcore/_recipe_checks.py

Co-authored-by: Javier Vegas-Regidor &lt;javier.vegas@bsc.es&gt;

* Fix failing test

Co-authored-by: Javier Vegas-Regidor &lt;javier.vegas@bsc.es&gt;
diff --git a/esmvalcore/_recipe_checks.py b/esmvalcore/_recipe_checks.py
@@ -142,7 +142,8 @@ def data_availability(input_files, var, dirnames, filenames):
     if missing_years:
         raise RecipeError(
             "No input data available for years {} in files {}".format(
-                ", ".join(str(year) for year in missing_years), input_files))
+                ", ".join(str(year) for year in sorted(missing_years)),
+                input_files))
 
 
 def tasks_valid(tasks):
diff --git a/tests/integration/test_recipe_checks.py b/tests/integration/test_recipe_checks.py
@@ -40,7 +40,7 @@
     (FILES[:-1], dict(VAR), ERR_RANGE.format('2025', FILES[:-1])),
     (FILES[:-2], dict(VAR), ERR_RANGE.format('2024, 2025', FILES[:-2])),
     ([FILES[1]] + [FILES[3]], dict(VAR),
-     ERR_RANGE.format('2024, 2025, 2020, 2022', [FILES[1]] + [FILES[3]])),
+     ERR_RANGE.format('2020, 2022, 2024, 2025', [FILES[1]] + [FILES[3]])),
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`(FILES[:-1], dict(VAR), ERR_RANGE.format('2025', FILES[:-1])),`
`41`	`41`	`(FILES[:-2], dict(VAR), ERR_RANGE.format('2024, 2025', FILES[:-2])),`
`42`	`42`	`([FILES[1]] + [FILES[3]], dict(VAR),`
`43`		`- ERR_RANGE.format('2024, 2025, 2020, 2022', [FILES[1]] + [FILES[3]])),`
	`43`	`+ ERR_RANGE.format('2020, 2022, 2024, 2025', [FILES[1]] + [FILES[3]])),`
`44`	`44`	`]`
`45`	`45`
`46`	`46`