Makes unittest input to be a list

Should make it easier to write cross platform unittests.
Also, removed the `shell=True` we do not need that anymore, only
the `sys.executable`.
Some additional sanitisation of input and Path fixups

Author: gnikit

test/setup_tests.py

@@ -1,4 +1,6 @@
-import os
+from __future__ import annotations
+
+import shlex
 import subprocess
 import sys
 from io import StringIO
@@ -14,16 +16,23 @@
     write_rpc_request,
 )
 
-run_command = os.path.join(
-    root_dir, "fortls.py --incremental_sync --use_signature_help"
-)
 test_dir = root_dir / "test" / "test_source"
 
 
-def run_request(request, fortls_args=""):
+def run_request(request, fortls_args: list[str] = None):
+    command = [
+        sys.executable,
+        str(root_dir / "fortls.py"),
+        "--incremental_sync",
+        "--use_signature_help",
+    ]
+    if fortls_args:
+        # Input args might not be sanitised, fix that
+        for i in fortls_args:
+            command.extend(shlex.split(i))
+
     pid = subprocess.Popen(
-        run_command + fortls_args,
-        shell=True,
+        command,
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,

test/test_preproc.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pathlib import Path
 from setup_tests import (
     run_request,
     # path_to_uri,
@@ -16,7 +15,7 @@ def hover_req(file_path: str, ln: int, col: int) -> str:
             1,
             "textDocument/hover",
             {
-                "textDocument": {"uri": file_path},
+                "textDocument": {"uri": str(file_path)},
                 "position": {"line": ln, "character": col},
             },
         )
@@ -26,17 +25,17 @@ def check_return(result_array, checks):
         for (i, check) in enumerate(checks):
             assert result_array[i]["contents"][0]["value"] == check
 
-    root_dir = Path(test_dir).resolve() / "pp"
+    root_dir = test_dir / "pp"
     string = write_rpc_request(1, "initialize", {"rootPath": str(root_dir)})
-    file_path = str(root_dir / "preproc.F90")
+    file_path = root_dir / "preproc.F90"
     string += hover_req(file_path, 5, 8)  # user defined type
     string += hover_req(file_path, 7, 30)  # variable
     string += hover_req(file_path, 7, 40)  # multi-lin variable
     string += hover_req(file_path, 8, 7)  # function with if conditional
     string += hover_req(file_path, 9, 7)  # multiline function with if conditional
-    file_path = str(root_dir / "preproc_keywords.F90")
+    file_path = root_dir / "preproc_keywords.F90"
     string += hover_req(file_path, 6, 2)  # ignores PP across Fortran line continuations
-    errcode, results = run_request(string, f' --config={root_dir/".pp_conf.json"}')
+    errcode, results = run_request(string, [f'--config={root_dir/".pp_conf.json"}'])
     assert errcode == 0
 
     # Reference solution

test/test_server.py

@@ -51,7 +51,7 @@ def check_return(result_dict):
 def test_logger():
     """Test the logger"""
     string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
-    errcode, results = run_request(string, " --debug_log")
+    errcode, results = run_request(string, ["--debug_log"])
     assert errcode == 0
     assert results[1]["type"] == 3
     assert results[1]["message"] == "FORTLS debugging enabled"
@@ -63,7 +63,7 @@ def test_open():
     string += write_rpc_notification(
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
-    errcode, results = run_request(string, fortls_args=" --disable_diagnostics")
+    errcode, results = run_request(string, fortls_args=["--disable_diagnostics"])
     #
     assert errcode == 0
     assert len(results) == 1
@@ -126,7 +126,7 @@ def test_change():
     string += write_rpc_request(
         3, "textDocument/documentSymbol", {"textDocument": {"uri": str(file_path)}}
     )
-    errcode, results = run_request(string, fortls_args=" --disable_diagnostics")
+    errcode, results = run_request(string, fortls_args=["--disable_diagnostics"])
     #
     assert errcode == 0
     assert len(results) == 3
@@ -551,7 +551,7 @@ def check_return(result_array, checks):
     file_path = test_dir / "hover" / "pointers.f90"
     string += hover_req(file_path, 1, 26)
     errcode, results = run_request(
-        string, fortls_args=" --variable_hover --sort_keywords"
+        string, fortls_args=["--variable_hover", "--sort_keywords"]
     )
     assert errcode == 0
     #
@@ -699,7 +699,7 @@ def check_return(results, ref_results):
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
     file_path = str(test_dir / "diag" / "conf_long_lines.json")
-    errcode, res = run_request(string, f" --config {file_path}")
+    errcode, res = run_request(string, [f"--config {file_path}"])
     assert errcode == 0
     results.extend(res[1:])