Fix tests

pytroll · Nov 25, 2019 · b02bbdb · b02bbdb
1 parent e568e68
commit b02bbdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/satpy/tests/writer_tests/test_cf.py b/satpy/tests/writer_tests/test_cf.py
@@ -240,23 +240,23 @@ def test_bounds(self):
                                                     end_time=end_time))
         with TempFile() as filename:
             scn.save_datasets(filename=filename, writer='cf')
+            # Check decoded time coordinates & bounds
             with xr.open_dataset(filename, decode_cf=True) as f:
                 bounds_exp = np.array([[start_time, end_time]], dtype='datetime64[m]')
                 np.testing.assert_array_equal(f['time_bnds'], bounds_exp)
+                self.assertEqual(f['time'].attrs['bounds'], 'time_bnds')
 
-            # Check that time coordinates and bounds have the same units
+            # Check raw time coordinates & bounds
             with xr.open_dataset(filename, decode_cf=False) as f:
-                self.assertEqual(f['time_bnds'].attrs['units'], f['time'].attrs['units'])
-                self.assertEqual(f['time_bnds'].attrs['calendar'], f['time'].attrs['calendar'])
+                np.testing.assert_almost_equal(f['time_bnds'], [[-0.0034722, 0.0069444]])
 
         # User-specified time encoding should have preference
         with TempFile() as filename:
             time_units = 'seconds since 2018-01-01'
             scn.save_datasets(filename=filename, encoding={'time': {'units': time_units}},
                               writer='cf')
             with xr.open_dataset(filename, decode_cf=False) as f:
-                self.assertEqual(f['time'].attrs['units'], time_units)
-                self.assertEqual(f['time_bnds'].attrs['units'], time_units)
+                np.testing.assert_array_equal(f['time_bnds'], [[12909600, 12910500]])
 
     def test_bounds_minimum(self):
         """Test minimum bounds."""

diff --git a/satpy/writers/cf_writer.py b/satpy/writers/cf_writer.py
@@ -588,7 +588,7 @@ def update_encoding(self, dataset, to_netcdf_kwargs):
                           'calendar': time_enc['calendar'],
                           '_FillValue': None}
             encoding['time'] = time_enc
-            encoding['time_bnds'] = bounds_enc
+            encoding['time_bnds'] = bounds_enc  # FUTURE: Not required anymore with xarray-0.14+
 
         return encoding, other_to_netcdf_kwargs