Merge pull request #2730 from cwensley/curtis/fix-running-tests-in-th…

…e-app Don't when running tests with the test app
picoe · Jan 25, 2025 · d7b9720 · d7b9720
2 parents 3c810ee + 788023f
commit d7b9720
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/Eto.Test/UnitTests/TestBase.cs b/test/Eto.Test/UnitTests/TestBase.cs
@@ -61,6 +61,7 @@ public override TestResult Execute(TestExecutionContext context)
     public class EtoTestSetup
     {
 		static bool _quit;
+		static bool _appWasCreated;
 
 		/// <summary>
 		/// Timeout for application initialization
@@ -157,6 +158,8 @@ public static void Initialize()
 					thread.Start();
 					if (!ev.WaitOne(ApplicationTimeout))
 						Assert.Fail("Could not initialize application");
+
+					_appWasCreated = true;
 					if (exception != null)
 						ExceptionDispatchInfo.Capture(exception).Throw();
 				}
@@ -173,6 +176,8 @@ public void GlobalSetup()
         public void GlobalTeardown()
         {
 			_quit = true;
+			if (!_appWasCreated)
+				return;
 			Application.Instance?.AsyncInvoke(() =>
 			{
 				Application.Instance?.Quit();