From a1cf938ef1a0adf9245ac88b852bdbb092a63963 Mon Sep 17 00:00:00 2001 From: Chris Blyth Date: Thu, 15 Feb 2018 14:06:41 +0000 Subject: [PATCH] Revert changes to agent so sleep is not performed --- src/NUnitEngine/nunit-agent/Program.cs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/NUnitEngine/nunit-agent/Program.cs b/src/NUnitEngine/nunit-agent/Program.cs index 7c2bfd3c5..a9ce4ad80 100644 --- a/src/NUnitEngine/nunit-agent/Program.cs +++ b/src/NUnitEngine/nunit-agent/Program.cs @@ -25,7 +25,6 @@ using System.Diagnostics; using System.IO; using System.Security; -using System.Threading; using NUnit.Common; using NUnit.Engine; using NUnit.Engine.Agents; @@ -140,17 +139,17 @@ public static void Main(string[] args) else { log.Error("Failed to start RemoteTestAgent"); - ExitWithPause(AgentExitCodes.FAILED_TO_START_REMOTE_AGENT); + Environment.Exit(AgentExitCodes.FAILED_TO_START_REMOTE_AGENT); } } catch (Exception ex) { log.Error("Exception in RemoteTestAgent", ex); - ExitWithPause(AgentExitCodes.UNEXPECTED_EXCEPTION); + Environment.Exit(AgentExitCodes.UNEXPECTED_EXCEPTION); } log.Info("Agent process {0} exiting cleanly", pid); - ExitWithPause(AgentExitCodes.OK); + Environment.Exit(AgentExitCodes.OK); } private static void WaitForStop() @@ -162,7 +161,7 @@ private static void WaitForStop() if (AgencyProcess.HasExited) { log.Error("Parent process has been terminated."); - ExitWithPause(AgentExitCodes.PARENT_PROCESS_TERMINATED); + Environment.Exit(AgentExitCodes.PARENT_PROCESS_TERMINATED); } } @@ -184,7 +183,7 @@ private static void TryLaunchDebugger() { log.Error($"System.Security.Permissions.UIPermission is not set to start the debugger. {se} {se.StackTrace}"); } - ExitWithPause(AgentExitCodes.DEBUGGER_SECURITY_VIOLATION); + Environment.Exit(AgentExitCodes.DEBUGGER_SECURITY_VIOLATION); } catch (NotImplementedException nie) //Debugger is not implemented on mono { @@ -192,14 +191,8 @@ private static void TryLaunchDebugger() { log.Error($"Debugger is not available on all platforms. {nie} {nie.StackTrace}"); } - ExitWithPause(AgentExitCodes.DEBUGGER_NOT_IMPLEMENTED); + Environment.Exit(AgentExitCodes.DEBUGGER_NOT_IMPLEMENTED); } } - - private static void ExitWithPause(int exitCode) - { - Thread.Sleep(TimeSpan.FromSeconds(2)); - Environment.Exit(exitCode); - } } }