From 7e7835f3f736a7289c1acfed0910597d14535103 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 21 Feb 2012 18:31:39 -0800 Subject: [PATCH] better process cleanup on automation teardown --- NzbDrone.Web.UI.Test/AutomationTestBase.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/NzbDrone.Web.UI.Test/AutomationTestBase.cs b/NzbDrone.Web.UI.Test/AutomationTestBase.cs index 0bb0e9717..602fd9d41 100644 --- a/NzbDrone.Web.UI.Test/AutomationTestBase.cs +++ b/NzbDrone.Web.UI.Test/AutomationTestBase.cs @@ -110,15 +110,12 @@ namespace NzbDrone.Web.UI.Automation private void StopNzbDrone() { - foreach (var process in Process.GetProcessesByName("nzbdrone")) - { - process.Kill(); - process.WaitForExit(); - } - foreach (var process in Process.GetProcessesByName("iisexpress")) + foreach (var process in Process.GetProcesses()) { - process.Kill(); + if (string.Equals(process.ProcessName, "NzbDrone", StringComparison.InvariantCultureIgnoreCase) + || string.Equals(process.ProcessName, "IISExpress", StringComparison.InvariantCultureIgnoreCase)) + process.Kill(); process.WaitForExit(); } @@ -126,9 +123,15 @@ namespace NzbDrone.Web.UI.Automation { StartProcess("ServiceUninstall.exe", true); } - catch (Exception) - { + catch { } + foreach (var process in Process.GetProcesses()) + { + if (string.Equals(process.ProcessName, "NzbDrone", StringComparison.InvariantCultureIgnoreCase) + || string.Equals(process.ProcessName, "IISExpress", StringComparison.InvariantCultureIgnoreCase) + || string.Equals(process.ProcessName, "ServiceUninstall", StringComparison.InvariantCultureIgnoreCase)) + process.Kill(); + process.WaitForExit(); } }