Destroy the agent pool when tests are completed.

bterlson · Jul 23, 2016 · 9ba4269 · 9ba4269
1 parent b6ddcda
commit 9ba4269
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/bin/run.js b/bin/run.js
@@ -36,7 +36,7 @@ const files = paths.map(pathToTestFile);
 const tests = files.map(compileFile);
 const scenarios = tests.flatMap(scenariosForTest);
 const pairs = Rx.Observable.zip(pool, scenarios);
-const rawResults = pairs.flatMap(pool.runTest);
+const rawResults = pairs.flatMap(pool.runTest).tapOnCompleted(() => pool.destroy());;
 const results = rawResults.map(function (test) {
   test.result = validator(test);
   return test;

diff --git a/lib/agentPool.js b/lib/agentPool.js
@@ -3,15 +3,17 @@ const Rx = require('rx');
 const eshost = require('eshost');
 
 module.exports = makePool;
-function makePool(agents, hostType, hostArgs, hostPath) {
+function makePool(agentCount, hostType, hostArgs, hostPath) {
   const pool = new Rx.Subject();
+  const agents = [];
 
-  for (var i = 0; i < agents; i++) {
+  for (var i = 0; i < agentCount; i++) {
     eshost.createAgent(hostType, {
       hostArguments: hostArgs,
       hostPath: hostPath
     })
     .then(agent => {
+      agents.push(agent);
       pool.onNext(agent);
     })
     .catch(e => {
@@ -35,5 +37,10 @@ function makePool(agents, hostType, hostArgs, hostPath) {
       process.exit(1);
     });
   }
-  return pool;
+
+  pool.destroy = function () {
+    agents.forEach(agent => agent.destroy());
+  }
+
+  return pool
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "test262-harness",
   "repository": "bterlson/test262-harness",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Node-based harness for test262",
   "main": "index.js",
   "bin": {