Fix a race condition.

vddCore · May 25, 2024 · e59d046 · e59d046
1 parent 84e12c3
commit e59d046
Showing 1 changed file with 56 additions and 5 deletions.
diff --git a/VirtualMachine/Tests/EVIL.Ceres.LanguageTests/Test.cs b/VirtualMachine/Tests/EVIL.Ceres.LanguageTests/Test.cs
@@ -5,6 +5,8 @@
 using EVIL.Ceres.ExecutionEngine;
 using EVIL.Ceres.ExecutionEngine.Concurrency;
 using EVIL.Ceres.ExecutionEngine.Diagnostics;
+using EVIL.Ceres.ExecutionEngine.TypeSystem;
+using EVIL.CommonTypes.TypeSystem;
 
 namespace EVIL.Ceres.LanguageTests
 {
@@ -43,6 +45,11 @@ public async Task Run()
                 await Task.Delay(1);
             }
 
+            if (Fiber.State == FiberState.Crashed)
+            {
+                _processingCrash = true;
+            }
+
             while (_processingCrash)
             {
                 await Task.Delay(1);
@@ -51,14 +58,58 @@ public async Task Run()
             Fiber.DeImmunize();
         }
 
-        private void TestCrashHandler(Fiber fiber, Exception exception)
+        private async void TestCrashHandler(Fiber fiber, Exception exception)
         {
-            _processingCrash = true;
-
+            while (!_processingCrash)
+            {
+                await Task.Delay(1);
+            }
+
             Successful = false;
-            ErrorMessage = exception.Message;
-            StackTrace.AddRange(fiber.StackTrace(false).Split('\n').Where(x => !string.IsNullOrEmpty(x)));
 
+            if (exception is UserUnhandledExceptionException uuee)
+            {
+                if (uuee.EvilExceptionObject.Type == DynamicValueType.Error)
+                {
+                    var e = uuee.EvilExceptionObject.Error!;
+                    if (e["__should_have_thrown"] == true)
+                    {
+                        CallsAnyAsserts = true;
+
+                        if (e["__threw"] == true)
+                        {
+                            Successful = true;
+                        }
+                        else
+                        {
+                            ErrorMessage = "Expected function to throw, but it was successful.";
+                        }
+                    }
+                    else if (e["__should_not_have_thrown"] != DynamicValue.Nil)
+                    {
+                        CallsAnyAsserts = true;
+
+                        if (e["__threw"] == false)
+                        {
+                            Successful = true;
+                        }
+                        else
+                        {
+                            ErrorMessage = "Expected function to be successful, but it threw.";
+                        }
+                    }
+                }
+            }
+            else
+            {
+                ErrorMessage = exception.Message;
+            }
+
+            if (!Successful)
+            {
+                StackTrace.AddRange(fiber.StackTrace(false).Split('\n').Where(x => !string.IsNullOrEmpty(x)));
+            }
+
             _processingCrash = false;
         }