[test] Update tests to be consistent with new functionality

foreversd · May 29, 2011 · d6b0d0e · d6b0d0e
1 parent 921966a
commit d6b0d0e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/examples/error-on-timer.js b/examples/error-on-timer.js
@@ -11,4 +11,4 @@ var sys = require('sys');
 setTimeout(function () {
   sys.puts('Throwing error now.');
   throw new Error('User generated fault.');
-}, 1000);
+}, 200);
diff --git a/lib/forever.js b/lib/forever.js
@@ -362,7 +362,7 @@ forever.list = function (format, procs) {
 // Utility function for removing excess pid and 
 // config, and log files used by forever.
 //
-forever.cleanUp = function (cleanLogs) {
+forever.cleanUp = function (cleanLogs, allowManager) {
   var emitter = new events.EventEmitter(),
       processes = getAllProcesses(true),
       pidPath = forever.config.get('pidPath');
@@ -373,7 +373,7 @@ forever.cleanUp = function (cleanLogs) {
     function cleanProcess (proc, next) {
       checkProcess(proc.pid, function (child) {
         checkProcess(proc.foreverPid, function (manager) {
-          if (!child && !manager || proc.dead) {
+          if (!child && !manager || (!child && manager && allowManager) || proc.dead) {
             fs.unlink(path.join(pidPath, proc.uid + '.fvr'), function () {
               fs.unlink(path.join(pidPath, proc.uid + '.pid'), function () {
                 //

diff --git a/test/forever-test.js b/test/forever-test.js
@@ -37,6 +37,7 @@ vows.describe('forever').addBatch({
     topic: function () {
       var child = new (forever.Forever)(path.join(__dirname, '..', 'examples', 'error-on-timer.js'), {
         max: 3,
+        minUptime: 200,
         silent: true,
         outFile: 'test/stdout.log',
         errFile: 'test/stderr.log',
@@ -75,4 +76,21 @@ vows.describe('forever').addBatch({
       assert.isTrue(err.message.indexOf('does not exist') !== -1);
     }
   }
+}).addBatch({
+  "When the tests are over": {
+    "a call to forever.list()": {
+      topic: function () {
+        var that = this;
+        var tidy = forever.cleanUp(true, true);
+
+        tidy.on('cleanUp', function () {
+          that.callback(null, forever.list(false));
+        });
+      },
+      "should respond with no processes": function (err, procs) {
+        assert.isNull(err);
+        assert.isNull(procs);
+      }
+    }
+  }
 }).export(module);
diff --git a/test/multiple-processes-test.js b/test/multiple-processes-test.js
@@ -14,7 +14,7 @@ var sys = require('sys'),
     vows = require('vows'),
     forever = require('forever');
 
-vows.describe('forever').addBatch({
+vows.describe('forever/multiple-processes').addBatch({
   "When using forever": {
     "and spawning two processes using the same script": {
       topic: function () {

diff --git a/test/spin-test.js b/test/spin-test.js
@@ -14,7 +14,7 @@ var sys = require('sys'),
     vows = require('vows'),
     forever = require('forever');
 
-vows.describe('forever').addBatch({
+vows.describe('forever/spin-restart').addBatch({
   "When using forever": {
     "and spawning a script that spin restarts": {
       topic: function () {