Fix lint race when not running tests in parallel (#25235)

This commit is contained in:
Wesley Wigham 2018-06-26 12:27:49 -07:00 committed by GitHub
parent 133bb9f78d
commit 38dab7417a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -486,7 +486,6 @@ function runConsoleTests(defaultReporter, runInParallel) {
process.env.NODE_ENV = savedNodeEnv;
Travis.measure(startTime);
runLinterAndComplete();
finish();
}, function (e, status) {
process.env.NODE_ENV = savedNodeEnv;
Travis.measure(startTime);
@ -523,11 +522,11 @@ function runConsoleTests(defaultReporter, runInParallel) {
function runLinterAndComplete() {
if (!lintFlag || dirty) {
return;
return finish();
}
var lint = jake.Task['lint'];
lint.addListener('complete', function () {
complete();
lint.once('complete', function () {
finish();
});
lint.invoke();
}

@ -1 +1 @@
Subproject commit 6b9706810b55af326a93b9aa59cb17815a30bb32
Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6