Review changes.

Author: pp-mo

lib/iris/tests/integration/test_grib2.py

@@ -101,6 +101,7 @@ def test_cell_method(self):
         self.assertEqual(cell_method.coord_names, ('time',))
 
 
+@tests.skip_data
 class TestGDT5(tests.IrisTest):
     def test_save_load(self):
         # Load sample UKV data (variable-resolution rotated grid).
@@ -155,25 +156,31 @@ def test_save_load(self):
                 # Also load data, before the temporary file gets deleted.
                 cube_loaded_from_saved.data
 
+        # The re-loaded result will not match the original in every respect:
+        #  * cube attributes are discarded
+        #  * horizontal coordinates are rounded to an integer representation
+        #  * bounds on horizontal coords are lost
+        # Thus the following "equivalence tests" are rather piecemeal..
+
         # Check those re-loaded properties which should match the original.
         for test_cube in (cube, cube_loaded_from_saved):
             self.assertEqual(test_cube.standard_name,
                              'air_pressure_at_sea_level')
             self.assertEqual(test_cube.units, 'Pa')
             self.assertEqual(test_cube.shape, (744, 744))
-            self.assertEqual(cube_loaded_from_saved.cell_methods, ())
+            self.assertEqual(test_cube.cell_methods, ())
 
         # Check no cube attributes on the re-loaded cube.
         # Note: this does *not* match the original, but is as expected.
         self.assertEqual(cube_loaded_from_saved.attributes, {})
 
         # Now remaining to check: coordinates + data...
 
-        # Check they have the same set of coordinates.
+        # Check they have all the same coordinates.
         co_names = [coord.name() for coord in cube.coords()]
         co_names_reload = [coord.name()
                            for coord in cube_loaded_from_saved.coords()]
-        self.assertEqual(set(co_names_reload), set(co_names))
+        self.assertEqual(sorted(co_names_reload), sorted(co_names))
 
         # Check all the coordinates.
         for coord_name in co_names:
@@ -197,7 +204,7 @@ def test_save_load(self):
                 # but Grib does not store those bounds).
                 self.assertIsNone(co_load.bounds)
 
-            except Exception as err:
+            except AssertionError as err:
                 self.assertTrue(False,
                                 'Failed on coordinate "{}" : {}'.format(
                                     coord_name, str(err)))

lib/iris/tests/unit/fileformats/grib/message/test__GribMessage.py

@@ -189,26 +189,51 @@ def test_regular_mode_64_128(self):
         self._test(64 | 128)
 
 
+def _example_section_3(grib_definition_template_number, scanning_mode):
+    return {'sourceOfGridDefinition': 0,
+            'numberOfOctectsForNumberOfPoints': 0,
+            'interpretationOfNumberOfPoints': 0,
+            'gridDefinitionTemplateNumber': grib_definition_template_number,
+            'scanningMode': scanning_mode,
+            'Nj': 3,
+            'Ni': 4}
+
+
 class Test_data__grid_template_0(tests.IrisTest, Mixin_data__grid_template):
     def section_3(self, scanning_mode):
-        return {'sourceOfGridDefinition': 0,
-                'numberOfOctectsForNumberOfPoints': 0,
-                'interpretationOfNumberOfPoints': 0,
-                'gridDefinitionTemplateNumber': 0,
-                'scanningMode': scanning_mode,
-                'Nj': 3,
-                'Ni': 4}
+        return _example_section_3(0, scanning_mode)
+
+
+class Test_data__grid_template_1(tests.IrisTest, Mixin_data__grid_template):
+    def section_3(self, scanning_mode):
+        return _example_section_3(1, scanning_mode)
+
+
+class Test_data__grid_template_5(tests.IrisTest, Mixin_data__grid_template):
+    def section_3(self, scanning_mode):
+        return _example_section_3(5, scanning_mode)
 
 
 class Test_data__grid_template_90(tests.IrisTest, Mixin_data__grid_template):
     def section_3(self, scanning_mode):
-        return {'sourceOfGridDefinition': 0,
-                'numberOfOctectsForNumberOfPoints': 0,
-                'interpretationOfNumberOfPoints': 0,
-                'gridDefinitionTemplateNumber': 90,
-                'scanningMode': scanning_mode,
-                'Ny': 3,
-                'Nx': 4}
+        section_3 = _example_section_3(90, scanning_mode)
+        # Exceptionally, dimensions are 'Nx' + 'Ny' instead of 'Ni' + 'Nj'.
+        section_3['Nx'] = section_3['Ni']
+        section_3['Ny'] = section_3['Nj']
+        del section_3['Ni']
+        del section_3['Nj']
+        return section_3
+
+
+class Test_data__unknown_grid_template(tests.IrisTest):
+    def test(self):
+        message = _make_test_message(
+            {3: _example_section_3(999, 0),
+             6: SECTION_6_NO_BITMAP,
+             7: {'codedValues': np.arange(12)}})
+        with self.assertRaisesRegexp(TranslationError,
+                                     'template 999 is not supported'):
+            data = message.data
 
 
 if __name__ == '__main__':