diff --git a/NzbDrone.Common/ProcessProvider.cs b/NzbDrone.Common/ProcessProvider.cs index ec3df0672..578f954dc 100644 --- a/NzbDrone.Common/ProcessProvider.cs +++ b/NzbDrone.Common/ProcessProvider.cs @@ -34,7 +34,7 @@ namespace NzbDrone.Common private static List GetProcessesByName(string name) { var monoProcesses = Process.GetProcessesByName("mono") - .Where(process => process.Modules.Cast().Any(module => module.ModuleName.ToLower() == name + ".exe")); + .Where(process => process.Modules.Cast().Any(module => module.ModuleName.ToLower() == name.ToLower() + ".exe")); return Process.GetProcessesByName(name) .Union(monoProcesses).ToList(); } diff --git a/NzbDrone.Integration.Test/IntegrationTest.cs b/NzbDrone.Integration.Test/IntegrationTest.cs index 9077b3f4b..313e58f5b 100644 --- a/NzbDrone.Integration.Test/IntegrationTest.cs +++ b/NzbDrone.Integration.Test/IntegrationTest.cs @@ -1,8 +1,6 @@ -using System; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using System.Threading; +using NLog; +using NLog.Config; +using NLog.Targets; using NUnit.Framework; using NzbDrone.Api.Commands; using NzbDrone.Api.RootFolders; @@ -27,10 +25,20 @@ namespace NzbDrone.Integration.Test private NzbDroneRunner _runner; + + public IntegrationTest() + { + new StartupArguments(); + + LogManager.Configuration = new LoggingConfiguration(); + var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" }; + LogManager.Configuration.AddTarget(consoleTarget.GetType().Name, consoleTarget); + LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget)); + } + [SetUp] public void SmokeTestSetup() { - new StartupArguments(); _runner = new NzbDroneRunner(); _runner.KillAll();