From 6b6c16a48a58186394c4394530883f72817d74fc Mon Sep 17 00:00:00 2001 From: Shawn Mccarthy Date: Wed, 20 Dec 2017 12:24:05 -0700 Subject: [PATCH 1/3] Show passed test results if debug == true --- src/test_runner.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test_runner.js b/src/test_runner.js index f8e0fe5..b37d64b 100644 --- a/src/test_runner.js +++ b/src/test_runner.js @@ -617,6 +617,20 @@ class TestRunner { } } + logPassedTests: function () { + console.log(clc.greenBright("\n============= Passed Tests: =============\n")); + + this.passedTests.forEach(function (passedTest) { + console.log("\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -" + + " - - - - - - - - - - - - - - - "); + console.log("Passed Test: " + passedTest.toString()); + console.log(" # attempts: " + passedTest.attempts); + console.log(" output: "); + console.log(passedTest.stdout); + console.log(passedTest.stderr); + }); + }, + logFailedTests() { logger.log(clc.redBright("============= Failed Tests: =============")); @@ -639,6 +653,12 @@ class TestRunner { this.gatherTrends(); + if (this.debug) { + if (this.passedTests.length > 0) { + this.logPassedTests(); + } + } + if (this.failedTests.length > 0) { this.logFailedTests(); } From 4a07363a4b05a2656df466ecdf7a3ca6774c3d95 Mon Sep 17 00:00:00 2001 From: Shawn Mccarthy Date: Tue, 23 Jan 2018 11:02:45 -0700 Subject: [PATCH 2/3] add flag for showPassedTests --- src/cli.js | 2 ++ src/help.js | 5 +++++ src/settings.js | 1 + src/test_runner.js | 25 +++++++++++++------------ src/worker_allocator.js | 1 + 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/cli.js b/src/cli.js index 7fc567b..ccf637e 100644 --- a/src/cli.js +++ b/src/cli.js @@ -58,6 +58,7 @@ module.exports = (opts) => { // runOpts.margs.argv.framework.indexOf("mocha") > -1; const debug = runOpts.margs.argv.debug || false; + const showPassedTests = runOpts.margs.argv.show_passed_tests || false; const useSerialMode = runOpts.margs.argv.serial; let MAX_TEST_ATTEMPTS = parseInt(runOpts.margs.argv.max_test_attempts) || 3; let targetProfiles; @@ -408,6 +409,7 @@ module.exports = (opts) => { const testRunner = new runOpts.TestRunner(tests, { debug, + showPassedTests, maxWorkers: MAX_WORKERS, diff --git a/src/help.js b/src/help.js index c1ec1d8..d840309 100644 --- a/src/help.js +++ b/src/help.js @@ -71,6 +71,11 @@ module.exports = { "visible": true, "description": "Enable debugging magellan messages (dev mode)." }, + "show_passed_tests": { + "category": "Parallelism, Workflow and Filtering", + "visible": true, + "description": "Show passed tests output." + }, "config": { "category": "Configuration", "visible": true, diff --git a/src/settings.js b/src/settings.js index 33f1a4a..6367362 100644 --- a/src/settings.js +++ b/src/settings.js @@ -76,6 +76,7 @@ module.exports = { environment: env, debug: argv.debug, + showPassedTests: argv.show_passed_tests, gatherTrends: argv.gather_trends, diff --git a/src/test_runner.js b/src/test_runner.js index b37d64b..23280f1 100644 --- a/src/test_runner.js +++ b/src/test_runner.js @@ -37,6 +37,7 @@ const FINAL_CLEANUP_DELAY = 2500; // getEnvironment - function(worker, test) that returns a key value object to use as the // process environment // debug - true/false flag for magellan debugging mode +// showPassedTests - true/false flag for magellan show passed tests mode // onSuccess - function() callback // onFailure - function(failedTests) callback // opts: testing options @@ -69,6 +70,7 @@ class TestRunner { this.profiles = options.profiles; this.executors = options.executors; this.debug = options.debug; + this.showPassedTests = options.showPassedTests; this.serial = options.serial || false; @@ -617,17 +619,16 @@ class TestRunner { } } - logPassedTests: function () { - console.log(clc.greenBright("\n============= Passed Tests: =============\n")); - - this.passedTests.forEach(function (passedTest) { - console.log("\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -" - + " - - - - - - - - - - - - - - - "); - console.log("Passed Test: " + passedTest.toString()); - console.log(" # attempts: " + passedTest.attempts); - console.log(" output: "); - console.log(passedTest.stdout); - console.log(passedTest.stderr); + logPassedTests() { + logger.log(clc.greenBright("============= Passed Tests: =============")); + + this.passedTests.forEach((passedTest) => { + logger.log("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); + logger.log("Passed Test: " + passedTest.toString()); + logger.log(" # attempts: " + passedTest.attempts); + logger.log(" output: "); + logger.log(passedTest.stdout); + logger.log(passedTest.stderr); }); }, @@ -653,7 +654,7 @@ class TestRunner { this.gatherTrends(); - if (this.debug) { + if (this.showPassedTests) { if (this.passedTests.length > 0) { this.logPassedTests(); } diff --git a/src/worker_allocator.js b/src/worker_allocator.js index 20d9cc0..606db7a 100644 --- a/src/worker_allocator.js +++ b/src/worker_allocator.js @@ -18,6 +18,7 @@ class Allocator { checkPorts: portUtil.checkPorts, getNextPort: portUtil.getNextPort, debug: settings.debug + showPassedTests: settings.showPassedTests // Is this needed ? }, opts); logger.debug("Worker Allocator starting."); From c7075b9363b40b87d463873427ddaa76446baf1c Mon Sep 17 00:00:00 2001 From: Shawn Mccarthy Date: Tue, 23 Jan 2018 11:12:01 -0700 Subject: [PATCH 3/3] fix missing commas --- src/test_runner.js | 2 +- src/worker_allocator.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test_runner.js b/src/test_runner.js index 23280f1..7b6c662 100644 --- a/src/test_runner.js +++ b/src/test_runner.js @@ -630,7 +630,7 @@ class TestRunner { logger.log(passedTest.stdout); logger.log(passedTest.stderr); }); - }, + } logFailedTests() { logger.log(clc.redBright("============= Failed Tests: =============")); diff --git a/src/worker_allocator.js b/src/worker_allocator.js index 606db7a..a04ce02 100644 --- a/src/worker_allocator.js +++ b/src/worker_allocator.js @@ -17,7 +17,7 @@ class Allocator { setTimeout, checkPorts: portUtil.checkPorts, getNextPort: portUtil.getNextPort, - debug: settings.debug + debug: settings.debug, showPassedTests: settings.showPassedTests // Is this needed ? }, opts);