mocha-distributed 0.9.2 → 0.9.3

package/docker-compose.yml

@@ -7,9 +7,6 @@ services:
     ports:
       - 6379:6379
 
-    networks:
-      - mordor_gh_network
-
   redis-commander:
     image: rediscommander/redis-commander:latest
     environment:
@@ -19,9 +16,3 @@ services:
     depends_on:
       - redis
 
-    networks:
-      - mordor_gh_network
-
-networks:
-  mordor_gh_network:
-    external: true

package/example/suite-1.js

@@ -24,7 +24,7 @@ describe ('suite-1-async', async function () {
 
 describe ('suite-1-sync', function () {
   it ('test-1.1-async', async function () {
-    await util.sleep(0.5);
+    await util.sleep(1.5);
   })
 
   it ('test-1.2-sync', function () {
@@ -39,3 +39,27 @@ describe ('suite-1.2-sync', function () {
     });
   });
 });
+
+describe ('suite-1.3-io', function () {
+  it ('console.log', function () {
+    console.log ("Writing from console.log\nAnother line")
+  });
+
+  it ('console.error', function () {
+    console.error ("Writing from console.error\nAnother line")
+  });
+
+  it ('process.stdout', function () {
+    process.stdout.write("Writing from process.stdout. No newline.")
+  });
+
+  it ('process.stderr', function () {
+    process.stderr.write("Writing from process.stderr. No newline.")
+  });
+
+  it ('process.stdout & process.stderr', function () {
+    process.stdout.write("stdout output\nanother line")
+    process.stderr.write("stderr output\nanother line\nand yet another one.")
+  });
+
+});

package/index.js

@@ -32,6 +32,8 @@ if (g_granularity !== GRANULARITY.TEST) {
 
 let g_redis = null;
 
+let g_capture = { stdout: null, stderr: null };
+
 // -----------------------------------------------------------------------------
 // getTestPath
 //
@@ -57,6 +59,28 @@ function getTestPath(testContext) {
   return path.reverse();
 }
 
+// -----------------------------------------------------------------------------
+// captureStream
+// -----------------------------------------------------------------------------
+function captureStream(stream) {
+  var oldWrite = stream.write;
+  var buf = [];
+
+  stream.write = function(chunk, encoding, callback){
+    buf.push (chunk.toString()); // chunk is a String or Buffer
+    oldWrite.apply(stream, arguments);
+  }
+
+  return {
+    unhook(){
+     stream.write = oldWrite;
+    },
+    captured(){
+      return buf;
+    }
+  };
+}
+
 // -----------------------------------------------------------------------------
 // Initialize redis once before the tests
 // -----------------------------------------------------------------------------
@@ -131,14 +155,36 @@ exports.mochaHooks = {
       this.currentTest.title += " (skipped by mocha_distributted)";
       this.skip();
     }
+    else {
+      g_capture.stdout = captureStream(process.stdout);
+      g_capture.stderr = captureStream(process.stderr);
+    }
   },
   afterEach(done) {
     const SKIPPED = "pending";
     const FAILED = "failed";
+    const PASSED = "passed";
+
+    let capturedStdout = '';
+    let capturedStderr = '';
+    if (g_capture.stdout) {
+      const stdoutArray = g_capture.stdout.captured();
+      capturedStdout = stdoutArray.join('');
+      capturedStdout = capturedStdout.replace(/\s*\u001b\[3[12]m[^\n]*\n$/g, '');
+      g_capture.stdout.unhook();
+      g_capture.stdout = null;
+    }
+
+    if (g_capture.stderr) {
+      capturedStderr = g_capture.stderr.captured().join('');
+      g_capture.stderr.unhook();
+      g_capture.stderr = null;
+    }
 
     // Save all data in redis in a way it can be retrieved and aggregated
     // easily for all test by an external reporter
     if (this.currentTest.state !== SKIPPED) {
+      const stateFixed = this.currentTest.state || (this.currentTest.timedOut ? FAILED : PASSED)
       const testResult = {
         id: getTestPath(this.currentTest),
         type: this.currentTest.type,
@@ -148,10 +194,12 @@ exports.mochaHooks = {
         startTime: Date.now() - (this.currentTest.duration || 0),
         endTime: Date.now(),
         file: this.currentTest.file,
-        state: this.currentTest.state,
-        failed: this.currentTest.state === FAILED,
+        state: stateFixed,
+        failed: stateFixed === FAILED,
         speed: this.currentTest.speed,
         err: this.currentTest.err || null,
+        stdout: capturedStdout,
+        stderr: capturedStderr
       };
 
       // save results as single line on purpose
@@ -160,7 +208,7 @@ exports.mochaHooks = {
       g_redis.expire(key, g_expirationTime);
 
       // increment passed_count/failed_count & set expiry time
-      const countKey = `${g_testExecutionId}:${this.currentTest.state}_count`
+      const countKey = `${g_testExecutionId}:${stateFixed}_count`
       g_redis.incr(countKey);
       g_redis.expire(countKey, g_expirationTime);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mocha-distributed",
-  "version": "0.9.2",
-  "description": "Run multiple mocha suites and tests in parallel, from different processes or different machines",
+  "version": "0.9.3",
+  "description": "Run multiple mocha suites and tests in parallel, from different processes and different machines. Results available on a redis database.",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,6 +14,7 @@
     "integration tests",
     "pipelines",
     "chai",
+    "expect",
     "kubernetes",
     "docker",
     "mocha-parallel-tests",