Normans review addressed

xcube-dev · Oct 7, 2024 · 3d25072 · 3d25072
1 parent f96a11a
commit 3d25072
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/test/webapi/ows/stac/test_controllers.py b/test/webapi/ows/stac/test_controllers.py
@@ -148,14 +148,16 @@
 }
 
 
-def assert_equal_deep_dict(self, dict1, dict2):
+def assert_equal_deep_dict(self, dict1, dict2, msg=None):
+    if msg is None:
+        msg = "Error occurred in key:"
     for key in dict1:
         if isinstance(dict1[key], dict):
-            assert_equal_deep_dict(self, dict1[key], dict2[key])
+            assert_equal_deep_dict(self, dict1[key], dict2[key], msg=f"{msg} {key},")
         if hasattr(dict1[key], "__iter__"):
-            self.assertCountEqual(dict1[key], dict2[key])
+            self.assertCountEqual(dict1[key], dict2[key], msg=msg[:-1])
         else:
-            self.assertEqual(dict1[key], dict2[key])
+            self.assertEqual(dict1[key], dict2[key], msg=msg[:-1])
 
 
 class StacControllersTest(unittest.TestCase):

diff --git a/xcube/util/jsonencoder.py b/xcube/util/jsonencoder.py
@@ -102,6 +102,8 @@ def _convert_default(obj: Any) -> Any:
             elif np.issubdtype(obj.dtype, np.floating):
                 return float(obj)
             elif np.issubdtype(obj.dtype, np.datetime64):
+                # np.datetime_as_string returns a np._str object;
+                # the str() then returns a str object.
                 return str(np.datetime_as_string(obj, timezone="UTC", unit="s"))
             elif np.issubdtype(obj.dtype, np.str):
                 return str(obj)