Make wait factor controllable via environment variable

Author: eliericha

testsuite/drivers/pylsp.py

@@ -100,6 +100,7 @@ def run(self) -> None:
             env = {
                 "ALS": self.env.als,
                 "ALS_HOME": self.env.als_home,
+                "ALS_WAIT_FACTOR": str(self.env.wait_factor),
                 "PYTHONPATH": os.path.dirname(os.path.dirname(__file__)),
             }
 
@@ -657,8 +658,13 @@ async def async_wrapper(
 
             LOG.info("Running test function: %s", func.__name__)
 
+            actual_timeout = timeout
+            if "ALS_WAIT_FACTOR" in os.environ:
+                factor = int(os.environ["ALS_WAIT_FACTOR"])
+                actual_timeout *= factor
+
             # Run the test with a timeout
-            async with asyncio.timeout(timeout):
+            async with asyncio.timeout(actual_timeout):
                 await func(client)
 
             if assert_no_lsp_errors:

testsuite/testsuite.py

@@ -3,8 +3,8 @@
 import datetime
 import logging
 import os
+from shutil import which
 import sys
-from distutils.spawn import find_executable
 
 from drivers.basic import JsonTestDriver
 from drivers.gnatcov import GNATcov
@@ -80,23 +80,22 @@ def lookup_program(self, *args):
             return path + ".exe"
 
         # Otherwise, look for the requested program name in the PATH.
-        #
-        # TODO (S710-005): for some reason, on Windows we need to strip the
-        # ".exe" suffix for the tester-run program to be able to spawn ALS.
-        result = find_executable(os.path.basename(path))
+        result = which(os.path.basename(path))
         if result is None:
             raise RuntimeError(
                 "Could not find executable for {}".format(os.path.basename(path))
             )
-        return result[: -len(".exe")] if result.endswith(".exe") else result
+        # TODO (S710-005): for some reason, on Windows we need to strip the
+        # ".exe" suffix for the tester-run program to be able to spawn ALS.
+        return result[: -len(".exe")] if result.lower().endswith(".exe") else result
 
     def set_up(self):
         # Root directory for the "ada_language_server" repository
         self.env.repo_base = os.path.abspath(
             os.path.join(os.path.dirname(__file__), "..")
         )
 
-        self.env.wait_factor = 1
+        self.env.wait_factor = int(os.environ.get("ALS_WAIT_FACTOR", "1"))
 
         # Absolute paths to programs that test drivers can use
         if self.env.options.valgrind_memcheck: