groundwork around parallelizing mocha child runner

bttmly · Aug 14, 2015 · 6106256 · 6106256
1 parent 88d5b42
commit 6106256
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 105 deletions.
diff --git a/.jshintrc b/.jshintrc
diff --git a/Makefile b/Makefile
@@ -17,7 +17,10 @@ events:
 	./bin/perturb -r ./examples/event-emitter
 
 dogfood:
-	NODE_ENV=testing ./bin/perturb -r ./ -c 'make test'
+	NODE_ENV=testing ./bin/perturb --rootDir ./ --testCmd 'make test'
+
+dogfood-parallel:
+	NODE_ENV=testing ./bin/perturb --rootDir ./ --testCmd 'make test' --runner mochaChild --parallel
 
 dogfood-i:
 	NODE_ENV=testing ./bin/perturb -r ./ -i

diff --git a/bin/_perturb b/bin/_perturb
@@ -25,6 +25,8 @@ program
   .option("-i, --interception", "use interception strategy (no disk I/O)")
   .option("-v, --verbose", "lots of logging")
   .option("-k, --killRate", "minimum kill rate to exit with code 0")
+  .option("-p, --parallel", "run mutants in parallel (careful!)")
+  .option("-u, --runner <runner>")
   .parse(process.argv);
 
 if (program.rootDir && program.rootDir[0] !== "/") {
@@ -39,6 +41,7 @@ var userConfig = omitUndefined({
   sourceGlob: program.sourceGlob,
   testCmd: program.testCmd,
   interception: program.interception,
+  runner: program.runner,
 });
 
 // this will become the default reporter

diff --git a/lib/index.js b/lib/index.js
@@ -96,8 +96,10 @@ function makeSourceGroupHandler (config) {
     var sourceCode = mutants[0].sourceCode;
     var sourceFile = mutants[0].sourceFile;
 
+    var mapMethod = config.parallel ? async.map : async.mapSeries;
+
     console.log(sourceFile, "starting....");
-    async.mapSeries(mutants, runMutant(config), function (err, processedMutants) {
+    mapMethod(mutants, runMutant(config), function (err, processedMutants) {
       if (err) {
         console.log("ERR!", err);
         return done(err);

diff --git a/lib/run-mutant.js b/lib/run-mutant.js
@@ -42,6 +42,7 @@ function createMultiMutantRunner (config) {
     var last = finish(config, _done);
     var tests = mutant.testFiles.slice();
 
+    console.log("RUNNER:", config.runner);
     var runner = runners[config.runner || DEFAULT_RUNNER];
     if (runner == null) {
       throw new Error(ERRORS.InvalidReporter);

diff --git a/lib/runners/mocha-child.js b/lib/runners/mocha-child.js
@@ -8,12 +8,13 @@ function mochaChildProcessRunner (testFile, done) {
   var exited;
 
   var child = exec(cmd, opts, function (err, stdout, stderr) {
-    if (!exited && err) {
-      console.log("child error callback");
-      exited = true;
-      done(err.toString());
-    }
+    // if (!exited && err) {
+    //   console.log("child error callback");
+    //   exited = true;
+    //   return done(err.toString());
+    // }
 
+    console.log("CHILD EXITED WITH 0?", child.exitCode === 0, err);
     done();
   });
 

diff --git a/lib/types/mutator.js b/lib/types/mutator.js
@@ -61,8 +61,6 @@ function assertValidMutator (mutator) {
     // console.log("Validation failed", msg);
     throw new FmtError(ERRORS.InvalidMutator, msg);
   }
-  // if (isMutatorValid(mutator)) return;
-  // throw new FmtError(ERRORS.InvalidMutator);
 }
 
 module.exports = assertValidMutator;