Include nearest test name in uncaught errors, catch suite errors (microsoft#18694)

weswigham · web-flow · commit 5a0c60a9a1fe · 2017-09-25T10:26:23.000-07:00
diff --git a/src/harness/parallel/host.ts b/src/harness/parallel/host.ts
@@ -120,7 +120,7 @@ namespace Harness.Parallel.Host {
             child.on("message", (data: ParallelClientMessage) => {
                 switch (data.type) {
                     case "error": {
-                        console.error(`Test worker encounted unexpected error and was forced to close:
+                        console.error(`Test worker encounted unexpected error${data.payload.name ? ` during the execution of test ${data.payload.name}` : ""} and was forced to close:
         Message: ${data.payload.error}
         Stack: ${data.payload.stack}`);
                         return process.exit(2);
diff --git a/src/harness/parallel/shared.ts b/src/harness/parallel/shared.ts
@@ -6,7 +6,7 @@ namespace Harness.Parallel {
     export type ParallelCloseMessage = { type: "close" } | never;
     export type ParallelHostMessage = ParallelTestMessage | ParallelCloseMessage | ParallelBatchMessage;
 
-    export type ParallelErrorMessage = { type: "error", payload: { error: string, stack: string } } | never;
+    export type ParallelErrorMessage = { type: "error", payload: { error: string, stack: string, name?: string } } | never;
     export type ErrorInfo = ParallelErrorMessage["payload"] & { name: string };
     export type ParallelResultMessage = { type: "result", payload: { passing: number, errors: ErrorInfo[], duration: number, runner: TestRunnerKind, file: string } } | never;
     export type ParallelBatchProgressMessage = { type: "progress", payload: ParallelResultMessage["payload"] } | never;
diff --git a/src/harness/parallel/worker.ts b/src/harness/parallel/worker.ts
@@ -53,17 +53,41 @@ namespace Harness.Parallel.Worker {
         const savedTestList = testList;
 
         testList = [];
-        callback.call(fakeContext);
-        beforeFunc && beforeFunc();
-        beforeFunc = undefined;
+        try {
+            callback.call(fakeContext);
+        }
+        catch (e) {
+            errors.push({ error: `Error executing suite: ${e.message}`, stack: e.stack, name: namestack.join(" ") });
+            return cleanup();
+        }
+        try {
+            beforeFunc && beforeFunc();
+        }
+        catch (e) {
+            errors.push({ error: `Error executing before function: ${e.message}`, stack: e.stack, name: namestack.join(" ") });
+            return cleanup();
+        }
+        finally {
+            beforeFunc = undefined;
+        }
         testList.forEach(({ name, callback, kind }) => executeCallback(name, callback, kind));
-        testList.length = 0;
-        testList = savedTestList;
 
-        afterFunc && afterFunc();
-        afterFunc = undefined;
-        beforeEachFunc = savedBeforeEach;
-        namestack.pop();
+        try {
+            afterFunc && afterFunc();
+        }
+        catch (e) {
+            errors.push({ error: `Error executing after function: ${e.message}`, stack: e.stack, name: namestack.join(" ") });
+        }
+        finally {
+            afterFunc = undefined;
+            cleanup();
+        }
+        function cleanup() {
+            testList.length = 0;
+            testList = savedTestList;
+            beforeEachFunc = savedBeforeEach;
+            namestack.pop();
+        }
     }
 
     function executeCallback(name: string, callback: Function, kind: "suite" | "test") {
@@ -82,13 +106,15 @@ namespace Harness.Parallel.Worker {
             retries() { return this; },
             slow() { return this; },
         };
-        name = [...namestack, name].join(" ");
+        namestack.push(name);
+        name = namestack.join(" ");
         if (beforeEachFunc) {
             try {
                 beforeEachFunc();
             }
             catch (error) {
                 errors.push({ error: error.message, stack: error.stack, name });
+                namestack.pop();
                 return;
             }
         }
@@ -101,6 +127,9 @@ namespace Harness.Parallel.Worker {
                 errors.push({ error: error.message, stack: error.stack, name });
                 return;
             }
+            finally {
+                namestack.pop();
+            }
             passing++;
         }
         else {
@@ -124,6 +153,9 @@ namespace Harness.Parallel.Worker {
                 errors.push({ error: error.message, stack: error.stack, name });
                 return;
             }
+            finally {
+                namestack.pop();
+            }
             if (!completed) {
                 errors.push({ error: "Test completes asynchronously, which is unsupported by the parallel harness", stack: "", name });
             }
@@ -172,7 +204,7 @@ namespace Harness.Parallel.Worker {
             }
         });
         process.on("uncaughtException", error => {
-            const message: ParallelErrorMessage = { type: "error", payload: { error: error.message, stack: error.stack } };
+            const message: ParallelErrorMessage = { type: "error", payload: { error: error.message, stack: error.stack, name: namestack.join(" ") } };
             try {
                 process.send(message);
             }
