Rethrow thread exception when executing tests

Author: slozier

tests/IronPython.Tests/Cases/CaseExecuter.cs

@@ -10,6 +10,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.ExceptionServices;
 using System.Text.RegularExpressions;
 using System.Threading;
 
@@ -290,7 +291,9 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
                 engine.GetSysModule().SetVariable("argv", PythonList.FromArrayNoCopy(new object[] { source.Path }));
                 var compiledCode = source.Compile(new IronPython.Compiler.PythonCompilerOptions() { ModuleName = "__main__" });
 
-                int res = 0;
+                ExceptionDispatchInfo exceptionInfo = null;
+
+                int res = -1;
                 int maxStackSize = 2 * 1024 * 1024; // 2 MiB
                 var thread = new Thread(() => {
                     try {
@@ -301,12 +304,12 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
                         #pragma warning disable SYSLIB0006 // 'Thread.ResetAbort is not supported and throws PlatformNotSupportedException.' 
                         Thread.ResetAbort();
                         #pragma warning restore SYSLIB0006
-                    } catch (Exception ex) when (ex.GetPythonException() is object pex) {
-                        if (DynamicHelpers.GetPythonType(pex).Name == "SkipTest") {
+                    } catch (Exception ex) {
+                        if (ex.GetPythonException() is object pex && DynamicHelpers.GetPythonType(pex).Name == "SkipTest") {
                             NUnit.Framework.TestContext.Progress.WriteLine($"Test {testcase.Name} skipped: {pex}");
                             res = 0;
                         } else {
-                            throw;
+                            exceptionInfo = ExceptionDispatchInfo.Capture(ex);
                         }
                     }
                 }, maxStackSize) {
@@ -324,6 +327,9 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
                     NUnit.Framework.TestContext.Error.WriteLine($"{testcase.Name} timed out after {testcase.Options.Timeout / 1000.0} seconds.");
                     return -1;
                 }
+
+                exceptionInfo?.Throw();
+
                 return res;
             } finally {
                 Environment.CurrentDirectory = cwd;