Fix tests

Author: mraspaud

satpy/readers/core/netcdf.py

@@ -378,15 +378,18 @@ def get_data_as_xarray(variable):
     return arr
 
 
-def get_accessor_and_filehandle_from_engine(filename, engine):
-    """Choose an accessor from engine, and return in along with the file handle."""
+def choose_accessor_from_engine(engine):
+    """Choose an accessor from engine."""
     if engine == "netcdf4":
-        accessor = NetCDF4Accessor()
+        return NetCDF4Accessor()
     elif engine == "h5netcdf":
-        accessor = H5NetcdfAccessor()
-    else:
-        raise NotImplementedError(f"Engine {engine} not implemented.")
+        return H5NetcdfAccessor()
+    raise NotImplementedError(f"Engine {engine} not implemented.")
 
+
+def get_accessor_and_filehandle_from_engine(filename, engine):
+    """Choose an accessor from engine, and return in along with the file handle."""
+    accessor = choose_accessor_from_engine(engine)
     file_handle = accessor.create_file_handle(filename)
     return accessor, file_handle
 

satpy/tests/reader_tests/test_netcdf_utils.py

@@ -22,7 +22,7 @@
 import numpy as np
 import pytest
 
-from satpy.readers.core.netcdf import NetCDF4FileHandler, get_accessor_and_filehandle_from_engine
+from satpy.readers.core.netcdf import NetCDF4FileHandler, choose_accessor_from_engine
 
 
 class FakeNetCDF4FileHandler(NetCDF4FileHandler):
@@ -42,7 +42,7 @@ def __init__(self, filename, filename_info, filetype_info,
         if extra_file_content:
             self.file_content.update(extra_file_content)
         self.engine = "netcdf4"
-        self.accessor = get_accessor_and_filehandle_from_engine(filename, self.engine)
+        self.accessor = choose_accessor_from_engine(self.engine)
 
     def get_test_content(self, filename, filename_info, filetype_info):
         """Mimic reader input file content.