Additional tests for BMI error messages

Author: BSchilperoort

PyStemmusScope/bmi/implementation.py

@@ -47,16 +47,6 @@
 )
 
 
-def ipython_info():
-    """Get ipython info: if the code is being run from notebook or terminal."""
-    ip = False
-    if "ipykernel" in sys.modules:
-        ip = "notebook"
-    elif "IPython" in sys.modules:
-        ip = "terminal"
-    return ip
-
-
 def load_state(config: dict) -> h5py.File:
     """Load the STEMMUS_SCOPE model state.
 
@@ -85,7 +75,7 @@ def get_variable(state: h5py.File, varname: str) -> np.ndarray:
         if varname in MODEL_VARNAMES:
             msg = "Varname is missing in get_variable! Contact devs."
         else:
-            msg = "Uknown variable name"
+            msg = "Unknown variable name"
         raise ValueError(msg)
 
 
@@ -117,7 +107,7 @@ def set_variable(
     else:
         if varname in MODEL_OUTPUT_VARNAMES and varname not in MODEL_INPUT_VARNAMES:
             msg = "This variable is a model output variable only. You cannot set it."
-        if varname in MODEL_VARNAMES:
+        elif varname in MODEL_VARNAMES:
             msg = "Varname is missing in set_variable! Contact devs."
         else:
             msg = "Uknown variable name"

tests/test_bmi_docker.py

@@ -1,6 +1,7 @@
 import platform
 from distutils.dir_util import copy_tree
 from pathlib import Path
+from unittest.mock import patch
 import docker
 import docker.errors
 import numpy as np
@@ -218,6 +219,7 @@ def test_model_update(self, initialized_model):
         initialized_model.update()
 
 
+@pytest.mark.skipif(not docker_available(), reason="Docker not available")
 class TestUpdatedModel:
     # Many of these should be available after init
     def test_get_current_time(self, updated_model):
@@ -259,6 +261,32 @@ def test_get_value(self, updated_model):
         updated_model.get_value("respiration", dest)
         assert dest[0] != 0.0
 
+    def test_set_output_var(self, updated_model):
+        src = np.zeros(1)
+        with pytest.raises(ValueError, match="output variable"):
+            updated_model.set_value("respiration", src)
+
+    def test_get_wrong_value(self, updated_model):
+        dest = np.zeros(1)
+        with pytest.raises(ValueError, match="Unknown variable"):
+            updated_model.get_value("nonsense_variable", dest)
+
+    def test_dev_error_variables(self, updated_model):
+        dest = np.zeros(1)
+        with patch("PyStemmusScope.bmi.implementation.MODEL_VARNAMES", ("NONSENSE",)):
+            with pytest.raises(ValueError, match="Contact devs"):
+                updated_model.get_value("NONSENSE", dest)
+
+    def test_set_value(self, updated_model):
+        gridsize = updated_model.get_grid_size(
+            updated_model.get_var_grid("soil_temperature")
+        )
+        src = np.zeros(gridsize) + 10.0
+        dest = np.zeros(gridsize)
+        updated_model.set_value("soil_temperature", src)
+        updated_model.get_value("soil_temperature", dest)
+        np.testing.assert_array_equal(src, dest)
+
     def test_set_value_inds(self, updated_model):
         dest = np.zeros(1)
         updated_model.set_value_at_indices(