From 2b076322e5e1d5d53802ab47504838d8c59bd0b3 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 4 Mar 2023 15:54:02 +0000
Subject: [PATCH] check access before clearing job queue.

---
 tests/Avalonia.RenderTests/TestBase.cs           | 5 ++++-
 tests/Avalonia.UnitTests/TestWithServicesBase.cs | 6 +++++-
 tests/Avalonia.UnitTests/UnitTestApplication.cs  | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index 84f44aa200..81474d5efb 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -285,7 +285,10 @@ namespace Avalonia.Direct2D1.RenderTests
 
         public void Dispose()
         {
-            Dispatcher.UIThread.RunJobs();
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                Dispatcher.UIThread.RunJobs();
+            }
         }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TestWithServicesBase.cs b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
index 5d9e065d95..6f44aef1ba 100644
--- a/tests/Avalonia.UnitTests/TestWithServicesBase.cs
+++ b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
@@ -18,7 +18,11 @@ namespace Avalonia.UnitTests
 
         public void Dispose()
         {
-            Dispatcher.UIThread.RunJobs();
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                Dispatcher.UIThread.RunJobs();
+            }
+            
             _scope.Dispose();
         }
     }
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index c54308644f..fe7f9712b4 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -46,7 +46,11 @@ namespace Avalonia.UnitTests
             Dispatcher.UIThread.UpdateServices();
             return Disposable.Create(() =>
             {
-                Dispatcher.UIThread.RunJobs();
+                if (Dispatcher.UIThread.CheckAccess())
+                {
+                    Dispatcher.UIThread.RunJobs();
+                }
+
                 scope.Dispose();
                 Dispatcher.UIThread.UpdateServices();
             });