From b1ca2c1155da3920f0df5108b9fedbe82efaa11c Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Fri, 12 Apr 2019 11:04:58 -0700
Subject: [PATCH] Properly wait for karma to exit (#9315)

---
 .../clients/ts/FunctionalTests/scripts/run-tests.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
index ef03eb1da1..1fe581f4e8 100644
--- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
@@ -195,10 +195,9 @@ if (sauce) {
 }
 
 function runKarma(karmaConfig) {
-    return new Promise<karma.TestResults>((resolve, reject) => {
-        const server = new karma.Server(karmaConfig);
-        server.on("run_complete", (browsers, results) => {
-            return resolve(results);
+    return new Promise<number>((resolve, reject) => {
+        const server = new karma.Server(karmaConfig, (exitCode: number) => {
+            resolve(exitCode);
         });
         server.start();
     });
@@ -351,12 +350,10 @@ function runJest(httpsUrl: string, httpUrl: string) {
         if (config.browsers.length === 0) {
             console.log("Unable to locate any suitable browsers. Skipping browser functional tests.");
         } else {
-            karmaExit = (await runKarma(conf)).exitCode;
-        }
-
-        if (karmaExit) {
+            karmaExit = (await runKarma(conf));
             console.log(`karma exit code: ${karmaExit}`);
         }
+
         console.log(`jest exit code: ${jestExit}`);
 
         process.exit(jestExit !== 0 ? jestExit : karmaExit);