Expand tests

Author: znicholls

src/pandas_openscm/db/backends.py

@@ -79,15 +79,19 @@ def guess_backend(self, data_file_name: str) -> OpenSCMDBDataBackend:
         ValueError
             The backend could not be guessed from `data_file_name`
         """
-        ext = Path(data_file_name).suffix.strip(".")
-        try:
-            return self.get_instance(ext)
-        except KeyError as exc:
-            msg = (
-                f"Could not guess backend from filename {data_file_name}. "
-                f"we assumed the extension was {ext}."
-            )
-            raise ValueError(msg) from exc
+        ext = Path(data_file_name).suffix
+        for _, option_cls in self.options:
+            option = option_cls()
+            if ext == option.ext:
+                return option
+
+        known_options_and_extensions = [(v[0], v[1]().ext) for v in self.options]
+        msg = (
+            f"Could not guess backend from {data_file_name=!r}. "
+            "The file's extension does not match any of the available options: "
+            f"{known_options_and_extensions=}"
+        )
+        raise ValueError(msg)
 
 
 DATA_BACKENDS = DataBackendOptions(
@@ -167,15 +171,19 @@ def guess_backend(self, index_file_name: str) -> OpenSCMDBIndexBackend:
         ValueError
             The backend could not be guessed from `index_file_name`
         """
-        ext = Path(index_file_name).suffix.strip(".")
-        try:
-            return self.get_instance(ext)
-        except KeyError as exc:
-            msg = (
-                f"Could not guess backend from filename {index_file_name}. "
-                f"we assumed the extension was {ext}."
-            )
-            raise ValueError(msg) from exc
+        ext = Path(index_file_name).suffix
+        for _, option_cls in self.options:
+            option = option_cls()
+            if ext == option.ext:
+                return option
+
+        known_options_and_extensions = [(v[0], v[1]().ext) for v in self.options]
+        msg = (
+            f"Could not guess backend from {index_file_name=!r}. "
+            "The file's extension does not match any of the available options: "
+            f"{known_options_and_extensions=}"
+        )
+        raise ValueError(msg)
 
 
 INDEX_BACKENDS = IndexBackendOptions(

tests/integration/database/test_integration_database_portability.py

@@ -8,28 +8,47 @@
 import pandas as pd
 import pytest
 
-from pandas_openscm.db import FeatherDataBackend, FeatherIndexBackend, OpenSCMDB
+from pandas_openscm.db import (
+    CSVDataBackend,
+    CSVIndexBackend,
+    FeatherDataBackend,
+    FeatherIndexBackend,
+    OpenSCMDB,
+    netCDFDataBackend,
+    netCDFIndexBackend,
+)
 from pandas_openscm.testing import assert_frame_alike
 
+pytest.importorskip("filelock")
+
 
 @pytest.mark.parametrize(
-    "backend_data_for_class_method, backend_index_for_class_method",
+    "backend_data, backend_index",
     (
         pytest.param(
             FeatherDataBackend(),
             FeatherIndexBackend(),
-            id="provided",
+            id="feather",
+        ),
+        pytest.param(
+            netCDFDataBackend(),
+            netCDFIndexBackend(),
+            id="netCDF",
         ),
         pytest.param(
-            None,
-            None,
-            id="guessed",
+            CSVDataBackend(),
+            CSVIndexBackend(),
+            id="csv",
         ),
     ),
 )
-def test_move_db(
-    backend_data_for_class_method,
-    backend_index_for_class_method,
+@pytest.mark.parametrize("provide_backend_data_to_class_method", (True, False))
+@pytest.mark.parametrize("provide_backend_index_to_class_method", (True, False))
+def test_move_db(  # noqa: PLR0913
+    provide_backend_index_to_class_method,
+    provide_backend_data_to_class_method,
+    backend_data,
+    backend_index,
     tmpdir,
     setup_pandas_accessor,
 ):
@@ -39,8 +58,8 @@ def test_move_db(
 
     db = OpenSCMDB(
         db_dir=initial_db_dir,
-        backend_data=FeatherDataBackend(),
-        backend_index=FeatherIndexBackend(),
+        backend_data=backend_data,
+        backend_index=backend_index,
     )
 
     df_timeseries_like = pd.DataFrame(
@@ -63,19 +82,24 @@ def test_move_db(
     tar_archive = db.to_gzipped_tar_archive(tar_archive)
 
     # Expand elsewhere
+    from_gzipped_tar_archive_kwargs = {}
+    if provide_backend_data_to_class_method:
+        from_gzipped_tar_archive_kwargs["backend_data"] = backend_data
+
+    if provide_backend_index_to_class_method:
+        from_gzipped_tar_archive_kwargs["backend_index"] = backend_index
+
     db_other = OpenSCMDB.from_gzipped_tar_archive(
-        tar_archive,
-        db_dir=other_db_dir,
-        backend_data=backend_data_for_class_method,
-        backend_index=backend_index_for_class_method,
+        tar_archive, db_dir=other_db_dir, **from_gzipped_tar_archive_kwargs
     )
 
     # Delete the original
     db.delete()
 
-    assert_frame_alike(df_timeseries_like, db_other.load())
+    assert_frame_alike(df_timeseries_like, db_other.load(out_columns_type=int))
 
     locator = pd.Index(["scenario_b"], name="scenario")
     assert_frame_alike(
-        df_timeseries_like.openscm.mi_loc(locator), db_other.load(locator)
+        df_timeseries_like.openscm.mi_loc(locator),
+        db_other.load(locator, out_columns_type=int),
     )