[dotnet] Kill entire process tree when stopping test web server

nvborisenko · Dec 1, 2023 · 3384df3 · 3384df3
1 parent 94b566d
commit 3384df3
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
@@ -1,12 +1,10 @@
 using Bazel;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Diagnostics;
 using System.Text;
-using OpenQA.Selenium.Internal;
-using NUnit.Framework;
+using System.Net.Http;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -150,14 +148,8 @@ public void Start()
 
         public void Stop()
         {
-            HttpWebRequest request = WebRequest.Create(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")) as HttpWebRequest;
-            try
-            {
-                request.GetResponse();
-            }
-            catch (WebException)
-            {
-            }
+            using var httpClient = new HttpClient();
+            using var quitResponse = httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")).GetAwaiter().GetResult();
 
             if (webserverProcess != null)
             {
@@ -166,12 +158,9 @@ public void Stop()
                     webserverProcess.WaitForExit(10000);
                     if (!webserverProcess.HasExited)
                     {
-                        webserverProcess.Kill();
+                        webserverProcess.Kill(entireProcessTree: true);
                     }
                 }
-                catch (Exception)
-                {
-                }
                 finally
                 {
                     webserverProcess.Dispose();