Update CFG with configuration options given via command line (#2595)

ESMValGroup · Nov 29, 2024 · d8ad2f0 · d8ad2f0
1 parent 1cf3862
commit d8ad2f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/esmvalcore/_main.py b/esmvalcore/_main.py
@@ -439,9 +439,9 @@ def run(self, recipe, **kwargs):
 
         recipe = self._get_recipe(recipe)
 
+        CFG.update(kwargs)
+        CFG["resume_from"] = parse_resume(CFG["resume_from"], recipe)
         session = CFG.start_session(recipe.stem)
-        session.update(kwargs)
-        session["resume_from"] = parse_resume(session["resume_from"], recipe)
 
         self._run(recipe, session, cli_config_dir)
 

diff --git a/tests/unit/main/test_esmvaltool.py b/tests/unit/main/test_esmvaltool.py
@@ -21,20 +21,24 @@
 @pytest.fixture
 def cfg(mocker, tmp_path):
     """Mock `esmvalcore.config.CFG`."""
-    session = mocker.MagicMock()
-
     cfg_dict = {"resume_from": []}
-    session.__getitem__.side_effect = cfg_dict.__getitem__
-    session.__setitem__.side_effect = cfg_dict.__setitem__
-    session.update.side_effect = cfg_dict.update
+
+    cfg = mocker.MagicMock()
+    cfg.__getitem__.side_effect = cfg_dict.__getitem__
+    cfg.__setitem__.side_effect = cfg_dict.__setitem__
+    cfg.update.side_effect = cfg_dict.update
+
+    session = mocker.MagicMock()
+    session.__getitem__.side_effect = cfg.__getitem__
+    session.__setitem__.side_effect = cfg.__setitem__
+    session.update.side_effect = cfg.update
 
     output_dir = tmp_path / "esmvaltool_output"
     session.session_dir = output_dir / "recipe_test"
     session.run_dir = session.session_dir / "run_dir"
     session.preproc_dir = session.session_dir / "preproc_dir"
     session._fixed_file_dir = session.preproc_dir / "fixed_files"
 
-    cfg = mocker.Mock()
     cfg.start_session.return_value = session
 
     return cfg