Also set _forceStopped attribute to true when user uses ctrl+c to sto…

…p the test runner.
cloudkick · May 4, 2011 · 64569f9 · 64569f9
1 parent 1117ef2
commit 64569f9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/run.js b/lib/run.js
@@ -44,6 +44,7 @@ function TestRunner(tests, reporter, coverageReporter, coverage, verbosity) {
   this._testFilesData = {};
 
   this._completed = false;
+  this._forceStopped = false;
   this._completedTests = [];
 }
 
@@ -77,7 +78,7 @@ TestRunner.prototype.runTests = function(testInitFile, chdir,
     async.forEachSeries(self._tests, function(filePath, callback) {
       var cwd, child, timeoutId, testFileData;
 
-      if (self._completed) {
+      if (self._completed || self._forceStopped) {
         callback(new Error('Runner has been stopped'));
         return;
       }
@@ -110,6 +111,7 @@ TestRunner.prototype.runTests = function(testInitFile, chdir,
       child.on('exit', function() {
         clearTimeout(timeoutId);
         self._handleTestFileEnd(filePath);
+        delete self._testFilesData[filePath];
       });
     },
 
@@ -147,7 +149,7 @@ TestRunner.prototype._addCompletedTest = function(filePath) {
 TestRunner.prototype._handleTestsCompleted = function() {
   var statusCode;
 
-  if (!this._completed) {
+  if (!this._completed || this._forceStopped) {
     this._completed = true;
     this._stopServer();
 
@@ -186,7 +188,6 @@ TestRunner.prototype._handleTestFileEnd = function(filePath) {
 
   if (testFile) {
     testFile['callback']();
-    delete this._testFilesData[filePath];
   }
 };
 
@@ -235,6 +236,7 @@ TestRunner.prototype._startServer = function(socketPath, connectionHandler,
 TestRunner.prototype.forceStop = function() {
   var testFile, testFileData, child, timeoutId;
 
+  this._forceStopped = true;
   for (testFile in this._testFilesData) {
     if (this._testFilesData.hasOwnProperty(testFile)) {
       testFileData = this._testFilesData[testFile];