Merge pull request #940 from iainx/master

[Test Framework] Delay the test framework startup until MD has finish…
mono · Jun 10, 2015 · 62efa34 · 62efa34
2 parents ca5f9c2 + 4c8373f
commit 62efa34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs
@@ -82,7 +82,7 @@ public void StartApplication (string file = null, string args = null, IDictionar
 
 			process = Process.Start (pi);
 
-			if (!waitEvent.WaitOne (15000)) {
+			if (!waitEvent.WaitOne (120000)) {
 				try {
 					process.Kill ();
 				} catch { }

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
@@ -177,7 +177,6 @@ public static void Initialize (IProgressMonitor monitor)
 			commandService = new CommandManager ();
 			ideServices = new IdeServices ();
 			CustomToolService.Init ();
-			AutoTestService.Start (commandService, Preferences.EnableAutomatedTesting);
 
 			commandService.CommandTargetScanStarted += CommandServiceCommandTargetScanStarted;
 			commandService.CommandTargetScanFinished += CommandServiceCommandTargetScanFinished;
@@ -294,6 +293,7 @@ public static void Initialize (IProgressMonitor monitor)
 			IdeApp.Preferences.EnableInstrumentationChanged += delegate {
 				UpdateInstrumentationIcon ();
 			};
+			AutoTestService.Start (commandService, Preferences.EnableAutomatedTesting);
 			AutoTestService.NotifyEvent ("MonoDevelop.Ide.IdeStart");
 		}