fix: executables handling and add mock test (#869)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pyansys-ci-bot <[email protected]>

Author: 3 people

doc/changelog/869.fixed.md

@@ -0,0 +1 @@
+Executables handling and add mock test

src/ansys/dyna/core/run/linux_runner.py

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 import os
+from typing import Optional
 
 from ansys.tools.path import get_dyna_path, get_latest_ansys_installation
 from ansys.tools.path.path import _get_unified_install_base_for_version
@@ -44,25 +45,29 @@ def set_input(self, input_file: str, working_directory: str) -> None:
         self.input_file = input_file
         self.working_directory = working_directory
 
-    def _find_solver(self, version: int, executable: str) -> None:
-        atp_dyna_path = get_dyna_path(find=False, allow_input=False)
-        if executable is not None:
-            # User passed in executable directly. Use that.
-            if os.path.isfile(executable):
-                self.solver = executable
-        elif atp_dyna_path is not None:
-            # User stored dyna solver in ansys-tools-path, use that
+    def _find_solver(self, version: Optional[int], executable: Optional[str]) -> None:
+        """Determine the appropriate LS-DYNA solver executable path."""
+
+        if executable:
+            # Use user-provided executable path
+            if not os.path.isfile(executable):
+                raise FileNotFoundError(f"LS-DYNA executable not found at: {executable}")
+            self.solver = executable
+            return
+
+        # Check if solver is available from ansys-tools-path
+        atp_dyna_path = get_dyna_path(find=True, allow_input=False)
+        if atp_dyna_path:
             self.solver = atp_dyna_path
-        elif version is not None:
-            # User passed in the version, compute the path to the dyna solver from the
-            # unified installation
-            # of that version
+            return
+
+        # Resolve from specified version or fallback to latest
+        if version:
             install_loc, _ = _get_unified_install_base_for_version(version)
-            self.solver = os.path.join(install_loc, "ansys", "bin", "linx64", self._get_exe_name())
         else:
-            # User passed nothing, find the dyna solver from the latest unified installation
-            install_loc, _ = get_latest_ansys_installation()
-            self.solver = os.path.join(install_loc, "ansys", "bin", "linx64", self._get_exe_name())
+            _, install_loc = get_latest_ansys_installation()
+
+        self.solver = os.path.join(install_loc, "ansys", "bin", "linx64", self._get_exe_name())
 
     def _get_exe_name(self) -> str:
         exe_name = {

src/ansys/dyna/core/run/windows_runner.py

@@ -62,19 +62,24 @@ def _find_solver(self, version: int, executable: str = None) -> None:
         """Find LS-DYNA solver location."""
         if executable:
             exe_path = Path(executable)
-            if exe_path.is_file():
-                self.solver_location = str(exe_path.parent)
-                self.solver = f'"{str(exe_path)}"'
-                return
-            raise FileNotFoundError(f"Specified executable not found: {executable}")
+            if not exe_path.is_file():
+                raise FileNotFoundError(f"Specified LS-DYNA executable not found: {executable}")
+
+            self.solver_location = str(exe_path.parent)
+            self.solver = f'"{exe_path}"'  # Proper quoting for Windows paths with spaces
+            return
+
         if version:
             install_base, _ = _get_unified_install_base_for_version(version)
         else:
             _, install_base = get_latest_ansys_installation()
+
         solver_dir = Path(install_base) / "ansys" / "bin" / "winx64"
         solver_exe = solver_dir / self._get_exe_name()
+
         if not solver_exe.is_file():
             raise FileNotFoundError(f"LS-DYNA executable not found: {solver_exe}")
+
         self.solver_location = str(solver_dir)
         self.solver = f'"{str(solver_exe)}"'
 

tests/test_localrun.py

@@ -0,0 +1,63 @@
+import pytest
+import os
+from pathlib import Path
+from ansys.dyna.core.run.linux_runner import LinuxRunner
+
+
+@pytest.fixture
+def instance():
+    # Set default precision and mpi_option to avoid _get_exe_name() KeyError
+    runner = LinuxRunner()
+    runner.mpi_option = runner.mpi_option.SMP
+    runner.precision = runner.precision.DOUBLE
+    return runner
+
+
+def test_find_solver_with_valid_executable(monkeypatch):
+    fake_executable = "/fake/path/lsdyna_sp.e"
+    monkeypatch.setattr(os.path, "isfile", lambda path: path == fake_executable)
+
+    instance = LinuxRunner(executable=fake_executable)
+    assert instance.solver == fake_executable
+
+
+def test_find_solver_with_invalid_executable(monkeypatch):
+    fake_executable = "/invalid/path/lsdyna_sp.e"
+    monkeypatch.setattr(os.path, "isfile", lambda path: False)
+
+    with pytest.raises(FileNotFoundError, match="LS-DYNA executable not found"):
+        LinuxRunner(executable=fake_executable)
+
+
+def test_find_solver_with_version(monkeypatch):
+    monkeypatch.setattr("ansys.tools.path.path._read_config_file", lambda: {})
+    monkeypatch.setattr("ansys.tools.path.get_dyna_path", lambda *args, **kwargs: None)
+    monkeypatch.setattr("ansys.tools.path.path._get_unified_install_base_for_version",
+                        lambda version, supported_versions=None: ("/opt/ansys/v231", None))
+    monkeypatch.setattr(os.path, "isfile", lambda path: True)
+
+    instance = LinuxRunner(version=231)
+
+    expected_exe = "ansys/bin/linx64/lsdyna_dp.e"
+    assert instance.solver == expected_exe
+
+
+def test_find_solver_latest_install(monkeypatch):
+    monkeypatch.setattr("ansys.tools.path.path._read_config_file", lambda: {})
+    monkeypatch.setattr("ansys.tools.path.get_dyna_path", lambda *args, **kwargs: None)
+    monkeypatch.setattr("ansys.tools.path.path.get_available_ansys_installations",
+                        lambda: {251: '/usr/ansys_inc/v251'})
+
+    monkeypatch.setattr(
+        "ansys.tools.path.path.get_latest_ansys_installation",
+        lambda: (241, "/opt/ansys/v241")
+    )
+
+    monkeypatch.setattr(os.path, "isfile", lambda path: True)
+
+    instance = LinuxRunner()
+
+    expected_exe = "/usr/ansys_inc/v251/ansys/bin/linx64/lsdyna_dp.e"
+    assert instance.solver == expected_exe
+
+