Merge pull request #148 from nansencenter/otc2025

Update for the OTC 2025

Author: aperrin66

metanorm/normalizers/geospaas/earthdata_cmr.py

@@ -82,8 +82,11 @@ def get_instrument(self, raw_metadata):
         """Only get the first instrument from the raw metadata, because
         GeoSPaaS does not support more than one instrument per dataset
         """
-        return utils.get_gcmd_instrument(
-            raw_metadata['umm']['Platforms'][0]['Instruments'][0]['ShortName'])
+        try:
+            return utils.get_gcmd_instrument(
+                raw_metadata['umm']['Platforms'][0]['Instruments'][0]['ShortName'])
+        except KeyError:
+            return utils.get_gcmd_instrument(utils.UNKNOWN)
 
     @utils.raises((KeyError, IndexError))
     def get_location_geometry(self, raw_metadata):

tests/normalizers/test_earthdata_cmr.py

@@ -246,13 +246,10 @@ def test_instrument(self):
             mock_get_gcmd_method.assert_called_with('VIIRS')
 
     def test_instrument_missing_attribute(self):
-        """A MetadataNormalizationError must be raised if the raw
-        attribute is missing
+        """An unknown instrument must be returned if the raw attribute
+        is missing
         """
-        with self.assertRaises(MetadataNormalizationError):
-            self.normalizer.get_instrument({})
-        with self.assertRaises(MetadataNormalizationError):
-            self.normalizer.get_instrument({'umm': {'foo': 'bar'}})
+        self.assertEqual(self.normalizer.get_instrument({})['Category'], 'Unknown')
 
     def test_location_geometry_one_bounding_box(self):
         """Test getting the location_geometry from one bounding box"""