Fixes an issue with the dotnet executable not being killed (#34)

* Fixes an issue with the dotnet executable not being killed

* Returning the mtp_process.pid

* Set timeout for test discovery + added log for error

* formatting

---------

Co-authored-by: Wayne Bowie <[email protected]>
Co-authored-by: nsidorenco <[email protected]>

Author: 3 people

lua/neotest-vstest/mtp/client.lua

@@ -8,7 +8,7 @@ local M = {}
 ---@async
 ---@param dll_path string path to test project dll file
 ---@param mtp_env? table<string, string> environment variables for the mtp server
----@return nio.control.Future<uv.uv_tcp_t> server_future, integer mtp_process_pid
+---@return nio.control.Future<uv.uv_tcp_t> server_future, vim.SystemObj mtp_process
 local function start_server(dll_path, mtp_env)
   local server, server_err = vim.uv.new_tcp()
   assert(server, server_err)
@@ -33,7 +33,9 @@ local function start_server(dll_path, mtp_env)
       logger.debug("neotest-vstest: Accepted connection from mtp")
       mtp_client = client
       client:read_start(function(err, data)
-        assert(not err, err)
+        if err then
+          logger.warn("neotest-vstest: " .. err)
+        end
         if data then
           logger.trace("neotest-vstest: Received data from mtp with pid: " .. data)
           lsp_client:write(data)
@@ -76,7 +78,7 @@ local function start_server(dll_path, mtp_env)
 
   logger.debug("neotest-vstest: MTP process started with PID: " .. process.pid)
 
-  return server_future, process.pid
+  return server_future, process
 end
 
 local random = math.random
@@ -95,7 +97,7 @@ end
 ---@param mtp_env? table<string, string> environment variables for the mtp server
 ---@return nio.control.Future<vim.lsp.Client> client_future, integer mtp_process_pid
 function M.create_client(dll_path, on_update, on_log, mtp_env)
-  local server_future, mtp_process_pid = start_server(dll_path, mtp_env)
+  local server_future, mtp_process = start_server(dll_path, mtp_env)
   local client_future = nio.control.future()
 
   nio.run(function()
@@ -105,7 +107,11 @@ function M.create_client(dll_path, on_update, on_log, mtp_env)
       cmd = vim.lsp.rpc.connect(server:getsockname().ip, server:getsockname().port),
       root_dir = vim.fs.dirname(dll_path),
       on_exit = function()
+        logger.debug(
+          "neotest-vstest: MTP process shutdown triggered from client with PID: " .. mtp_process.pid
+        )
         server:shutdown()
+        mtp_process:kill(9)
       end,
       before_init = function(params)
         params.processId = vim.fn.getpid()
@@ -135,7 +141,7 @@ function M.create_client(dll_path, on_update, on_log, mtp_env)
     client_future.set(client)
   end)
 
-  return client_future, mtp_process_pid
+  return client_future, mtp_process.pid
 end
 
 ---@async
@@ -153,6 +159,7 @@ function M.discovery_tests(dll_path)
 
   local client_future = M.create_client(dll_path, on_update, function() end)
 
+  --@type vim.lsp.Client
   local client = client_future.wait()
 
   nio.scheduler()
@@ -161,7 +168,7 @@ function M.discovery_tests(dll_path)
   local run_id = uuid()
   client:request_sync("testing/discoverTests", {
     runId = run_id,
-  })
+  }, 30000)
 
   logger.debug("neotest-vstest: Discovered test results: " .. vim.inspect(tests))
 

lua/neotest-vstest/vstest/cli_wrapper.lua

@@ -111,7 +111,7 @@ function M.create_test_runner(project)
       process:write(content .. "\n")
     end,
     stop = function()
-      process:kill(0)
+      process:kill(9)
     end,
   }
 end