Merge pull request #9064 from mono/leak-test-flakey

Attempt to fix flakey leak test that happens due to not waiting for t…

Author: Therzok

main/tests/UserInterfaceTests/Ide.cs

@@ -52,8 +52,20 @@ public static void OpenFile (FilePath file)
 
 		public static void CloseAll (bool exit = true)
 		{
-			Session.ExecuteCommand (FileCommands.SaveAll);
-			Session.ExecuteCommand (FileCommands.CloseWorkspace);
+			var isDirty = (bool)Session.GetGlobalValue ("MonoDevelop.Ide.IdeApp.Workbench.DocumentsDirty");
+			if (isDirty) {
+				Session.RunAndWaitForTimer (() => {
+					Session.ExecuteCommand (FileCommands.SaveAll);
+				}, "Ide.Shell.SaveAll");
+			}
+
+			var workspaceOpen = (bool)Session.GetGlobalValue ("MonoDevelop.Ide.IdeApp.Workspace.IsOpen");
+			if (workspaceOpen) {
+				Session.RunAndWaitForTimer (() => {
+					Session.ExecuteCommand (FileCommands.CloseWorkspace);
+				}, "Ide.Shell.CloseWorkspace");
+			}
+
 			if (exit)
 				Session.ExitApp ();
 		}