mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

better process cleanup on automation teardown

This commit is contained in:
kay.one 2012-02-21 18:31:39 -08:00
parent b2a042bd30
commit 7e7835f3f7
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NzbDrone.Web.UI.Test/AutomationTestBase.cs
View File

@ -110,15 +110,12 @@ namespace NzbDrone.Web.UI.Automation
private void StopNzbDrone() 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(); process.WaitForExit();
} }
@ -126,9 +123,15 @@ namespace NzbDrone.Web.UI.Automation
{ {
StartProcess("ServiceUninstall.exe", true); 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();
} }
} }