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(); });