Skip to content
This repository has been archived by the owner on Jan 19, 2021. It is now read-only.

Commit

Permalink
Merge pull request #272 from chiahrens/print_help
Browse files Browse the repository at this point in the history
Print out help prior to loading the init scrips. Otherwise, something…
  • Loading branch information
cahrens777 authored Aug 15, 2019
2 parents e9c7690 + 04bfb11 commit 189dd60
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions bin/magellan
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ co(function *() {
yield cli.loadFramework({ argv });
yield cli.loadExecutors({ argv });

if (argv.help) {
yield cli.help({ argv });
}

const profiles = yield cli.detectProfiles({ argv, settings });
const executors = yield cli.enableExecutors({ argv, profiles });
const strategies = yield cli.loadStrategies({ argv });
const listeners = yield cli.loadListeners({ argv });

if (argv.help) {
yield cli.help({ argv });
}
// console.log(profiles)
// console.log(strategies)
// console.log(listeners)
Expand Down
4 changes: 2 additions & 2 deletions src/test_runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ class TestRunner {
_.map(this.listeners,
(listener) => new Promise((innerResolve) => {
const _listener = listener.flush();
if(_listener){
if (_listener) {
_listener.then(() => innerResolve())
.catch((err) => {
logger.err(`Error when flushing listener output: ${err}. ` +
"This error doesn't impact test result");
// we eat this error and contiue the listner.flush()
return innerResolve();
});
}else{
} else {
innerResolve();
}
})))
Expand Down

0 comments on commit 189dd60

Please sign in to comment.