Make tests succeed on Linux (#930)

Fixes #93
Deltares · Jan 9, 2024 · 7bef5bf · 7bef5bf
1 parent eec4eda
commit 7bef5bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build/ribasim_cli/tests/test_models.py b/build/ribasim_cli/tests/test_models.py
@@ -1,3 +1,4 @@
+import platform
 import subprocess
 from pathlib import Path
 
@@ -15,12 +16,14 @@ def test_ribasim_cli(model_constructor, tmp_path):
     assert isinstance(model, ribasim.Model)
     model.write(tmp_path / "ribasim.toml")
 
+    extension = ".exe" if platform.system() == "Windows" else ""
+
     executable = (
         Path(__file__).parents[2]
         / "create_binaries"
         / "ribasim_cli"
         / "bin"
-        / "ribasim.exe"
+        / f"ribasim{extension}"
     )
     result = subprocess.run([executable, tmp_path / "ribasim.toml"])
 

diff --git a/python/ribasim_api/tests/conftest.py b/python/ribasim_api/tests/conftest.py
@@ -1,3 +1,4 @@
+import platform
 from pathlib import Path
 
 import pytest
@@ -9,8 +10,10 @@
 @pytest.fixture(scope="session")
 def libribasim_paths() -> tuple[Path, Path]:
     repo_root = Path(__file__).parents[3].resolve()
-    lib_folder = repo_root / "build" / "create_binaries" / "libribasim" / "bin"
-    lib_path = lib_folder / "libribasim"
+    lib_or_bin = "bin" if platform.system() == "Windows" else "lib"
+    extension = ".dll" if platform.system() == "Windows" else ".so"
+    lib_folder = repo_root / "build" / "create_binaries" / "libribasim" / lib_or_bin
+    lib_path = lib_folder / f"libribasim{extension}"
     return lib_path, lib_folder