Add a file.exists() check for the server executable. (#261)

* Add a file.exists() check for the server executable.

* Resolve flake8

* Adding a test

* Exclude Linux lines from coverage for now

* Trying out actually running the test_launcher.py tests for server version 2.0 and above

* Fixed the test_start_local

Author: PProfizi

ansys/dpf/core/server.py

@@ -549,6 +549,7 @@ def check_version(self, required_version, msg=None):
 
         return server_meet_version_and_raise(required_version, self, msg)
 
+
 def _find_port_available_for_docker_bind(port):
     run_cmd = "docker ps --all"
     process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -562,6 +563,7 @@ def _find_port_available_for_docker_bind(port):
         port += 1
     return port
 
+
 def _run_launch_server_process(ansys_path, ip, port, docker_name):
     if docker_name:
         docker_server_port = int(os.environ.get("DOCKER_SERVER_PORT", port))
@@ -585,11 +587,13 @@ def _run_launch_server_process(ansys_path, ip, port, docker_name):
                        docker_name]
     else:
         if os.name == "nt":
-            run_cmd = f"Ans.Dpf.Grpc.bat --address {ip} --port {port}"
+            executable = "Ans.Dpf.Grpc.bat"
+            run_cmd = f"{executable} --address {ip} --port {port}"
             path_in_install = "aisol/bin/winx64"
         else:
-            run_cmd = ["./Ans.Dpf.Grpc.sh", f"--address {ip}", f"--port {port}"]
-            path_in_install = "aisol/bin/linx64"
+            executable = "./Ans.Dpf.Grpc.sh"  # pragma: no cover
+            run_cmd = [executable, f"--address {ip}", f"--port {port}"]  # pragma: no cover
+            path_in_install = "aisol/bin/linx64"  # pragma: no cover
 
         # verify ansys path is valid
         if os.path.isdir(f"{str(ansys_path)}/{path_in_install}"):
@@ -600,15 +604,20 @@ def _run_launch_server_process(ansys_path, ip, port, docker_name):
             raise NotADirectoryError(
                 f'Invalid ansys path at "{str(ansys_path)}".  '
                 "Unable to locate the directory containing DPF at "
-                f'"{dpf_run_dir}"'
-            )
+                f'"{dpf_run_dir}"')
+        else:
+            if not os.path.exists(os.path.join(dpf_run_dir, executable)):
+                raise FileNotFoundError(
+                    f'DPF executable not found at "{dpf_run_dir}".  '
+                    f'Unable to locate the executable "{executable}"')
 
     old_dir = os.getcwd()
     os.chdir(dpf_run_dir)
     process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     os.chdir(old_dir)
     return process
 
+
 def launch_dpf(ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=10., docker_name=None):
     """Launch Ansys DPF.
 

tests/test_launcher.py

@@ -1,31 +1,16 @@
+import os
 import pytest
-
 from ansys.dpf import core
-from ansys.dpf.core.misc import is_ubuntu
-
-ansys_path = core.misc.find_ansys()
-
-invalid_version = None
-if ansys_path is not None:
-    try:
-        invalid_version = int(ansys_path[-3:]) < 211
-    except:
-        invalid_version = True
-
-# skip unless ansys v212 is installed
-if ansys_path is None or invalid_version or is_ubuntu():
-    pytestmark = pytest.mark.skip("Requires local install of ANSYS 2021R2")
 
 
 def test_start_local():
     if not core.SERVER:
         core.start_local_server()
     starting_server = id(core.SERVER)
     n_init = len(core._server_instances)
-    server = core.start_local_server(as_global=False, ansys_path=core.SERVER.ansys_path)
+    server = core.start_local_server(as_global=False)
     assert len(core._server_instances) == n_init + 1
-    core._server_instances[-1]().shutdown()
-
+    server.shutdown()
     # ensure global channel didn't change
     assert starting_server == id(core.SERVER)
 
@@ -35,12 +20,21 @@ def test_start_local_failed():
         core.start_local_server(ansys_path="", use_docker_by_default=False)
 
 
+def test_start_local_failed_executable():
+    from ansys.dpf.core._version import __ansys_version__
+    from ansys.dpf.core.server import find_ansys
+    from pathlib import Path
+    with pytest.raises(FileNotFoundError):
+        path = Path(os.environ.get("AWP_ROOT" + __ansys_version__,
+                                   find_ansys())).parent.absolute()
+        core.start_local_server(ansys_path=path)
+
+
 def test_server_ip():
-    assert core.SERVER.ip != None
-    assert core.SERVER.port != None
-    assert core.SERVER.version != None
-
-    assert core.SERVER.info["server_process_id"] != None
-    assert core.SERVER.info["server_ip"] != None
-    assert core.SERVER.info["server_port"] != None
-    assert core.SERVER.info["server_version"] != None
+    assert core.SERVER.ip is not None
+    assert core.SERVER.port is not None
+    assert core.SERVER.version is not None
+    assert core.SERVER.info["server_process_id"] is not None
+    assert core.SERVER.info["server_ip"] is not None
+    assert core.SERVER.info["server_port"] is not None
+    assert core.SERVER.info["server_version"] is not None