huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly wait for karma to exit (#9315)

This commit is contained in:
BrennanConroy 2019-04-12 11:04:58 -07:00 committed by GitHub
parent 7d1bcd1235
commit b1ca2c1155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
View File

@ -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);