Wrapping .NET test web server process termination with try-catch

SeleniumHQ · Sep 22, 2015 · 8f310fc · 8f310fc
1 parent 8c106b0
commit 8f310fc
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
@@ -82,14 +82,22 @@ public void Stop()
 
             if (webserverProcess != null)
             {
-                webserverProcess.WaitForExit(10000);
-                if (!webserverProcess.HasExited)
+                try
                 {
-                    webserverProcess.Kill();
+                    webserverProcess.WaitForExit(10000);
+                    if (!webserverProcess.HasExited)
+                    {
+                        webserverProcess.Kill();
+                    }
+                }
+                catch (Exception)
+                {
+                }
+                finally
+                {
+                    webserverProcess.Dispose();
+                    webserverProcess = null;
                 }
-
-                webserverProcess.Dispose();
-                webserverProcess = null;
             }
         }
     }