Skip to content

Fix woa cmorizer tests #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bouweandela merged 8 commits into from
Nov 21, 2025
Merged

Fix woa cmorizer tests #4243

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b1c68af
reinstate old skip that now works with new configuration
valeriupredoi Nov 17, 2025
6adad32
run GHA
valeriupredoi Nov 17, 2025
1c4920b
unrun gha
valeriupredoi Nov 17, 2025
6bd2ef4
temp run dev test in Circle
valeriupredoi Nov 17, 2025
c2393ff
Merge branch 'main' into fix_woa_cmorizer_tests
valeriupredoi Nov 18, 2025
3aa3c70
remove skippable tests
valeriupredoi Nov 21, 2025
ba843c0
remove unused imports
valeriupredoi Nov 21, 2025
681bb62
Disable tests again
bouweandela Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions tests/integration/test_cmorizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
import sys

import esmvalcore
import iris
import iris.coord_systems
import iris.coords
Expand All @@ -14,9 +13,7 @@
import pytest
import yaml
from cf_units import Unit
from packaging import version

from esmvaltool import ESMValToolDeprecationWarning
from esmvaltool.cmorizers.data.cmorizer import DataCommand


Expand Down Expand Up @@ -155,54 +152,6 @@ def arguments(*args):
sys.argv = backup


@pytest.mark.skipif(
version.parse(esmvalcore.__version__) >= version.parse("2.14.0"),
reason="ESMValCore >= v2.14.0",
)
def test_cmorize_obs_woa_no_data_config_file(tmp_path):
"""Test for example run of cmorize_obs command."""
config_file = write_config_file(tmp_path)
os.makedirs(os.path.join(tmp_path, "raw_stuff", "Tier2"))
os.makedirs(os.path.join(tmp_path, "output_dir"))
with keep_cwd():
with pytest.raises(RuntimeError):
with pytest.warns(ESMValToolDeprecationWarning):
DataCommand().format("WOA", config_file=config_file)

log_dir = os.path.join(tmp_path, "output_dir")
log_file = os.path.join(
log_dir, os.listdir(log_dir)[0], "run", "main_log.txt"
)
check_log_file(log_file, no_data=True)


@pytest.mark.skipif(
version.parse(esmvalcore.__version__) >= version.parse("2.14.0"),
reason="ESMValCore >= v2.14.0",
)
def test_cmorize_obs_woa_data_config_file(tmp_path):
"""Test for example run of cmorize_obs command."""
config_file = write_config_file(tmp_path)
data_path = os.path.join(tmp_path, "raw_stuff", "Tier2", "WOA")
put_dummy_data(data_path)
with keep_cwd():
with pytest.warns(ESMValToolDeprecationWarning):
DataCommand().format("WOA", config_file=config_file)

log_dir = os.path.join(tmp_path, "output_dir")
log_file = os.path.join(
log_dir, os.listdir(log_dir)[0], "run", "main_log.txt"
)
check_log_file(log_file, no_data=False)
output_path = os.path.join(log_dir, os.listdir(log_dir)[0], "Tier2", "WOA")
check_output_exists(output_path)
check_conversion(output_path)


@pytest.mark.skipif(
version.parse(esmvalcore.__version__) < version.parse("2.12.0"),
reason="ESMValCore < v2.12.0",
)
def test_cmorize_obs_woa_no_data(tmp_path):
"""Test for example run of cmorize_obs command."""
write_config_file(tmp_path)
Expand All @@ -218,10 +167,6 @@ def test_cmorize_obs_woa_no_data(tmp_path):
check_log_file(log_file, no_data=True)


@pytest.mark.skipif(
version.parse(esmvalcore.__version__) < version.parse("2.12.0"),
reason="ESMValCore < v2.12.0",
)
def test_cmorize_obs_woa_data(tmp_path):
"""Test for example run of cmorize_obs command."""
write_config_file(tmp_path)
Expand Down