fix test suit

Unitech · Dec 12, 2014 · decc23b · decc23b
1 parent a4fd5cb
commit decc23b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/lib/God.js b/lib/God.js
@@ -186,24 +186,20 @@ God.executeApp = function executeApp(env, cb) {
         clu.removeAllListeners();
         clu.process.removeAllListeners();
         God.handleExit(clu, cst.ERROR_EXIT);
-        return false;
       });
 
       clu.once('exit', function cluExit(exited_clu, code) {
         clu.removeAllListeners();
         clu.process.removeAllListeners();
         God.handleExit(clu, code);
-        return false;
       });
 
       clu.once('online', function cluOnline() {
         console.log('App name:%s id:%s online', clu.pm2_env.name, clu.pm2_env.pm_id);
         clu.pm2_env.status = cst.ONLINE_STATUS;
         God.finalizeProcedure(clu);
-        if (cb) return cb(null, clu);
-        return false;
+        if (cb) cb(null, clu);
       });
-
       return false;
     });
   }

diff --git a/lib/Watcher.js b/lib/Watcher.js
@@ -60,7 +60,7 @@ module.exports = function ClusterMode(God) {
       var self = this;
 
       if (self.restarting === true) {
-        log('Already restarting skipping');
+        log('Already restarting, skipping');
         return false;
       }
 

diff --git a/test/bash/cli.sh b/test/bash/cli.sh
@@ -70,7 +70,7 @@ spec "should pid file exists"
 
 $pm2 stop all
 
-sleep 0.5
+sleep 1
 
 ls echo-0.pid
 ispec "should pid file be deleted once stopped"
@@ -79,11 +79,15 @@ $pm2 kill
 
 $pm2 start echo.js -p echo.pid -i 1
 
+sleep 1
+
 ls echo-0.pid
 spec "should pid file exists"
 
 $pm2 stop all
 
+sleep 1
+
 ls echo-0.pid
 ispec "should pid file be deleted once stopped"
 

diff --git a/test/bash/json_file.sh b/test/bash/json_file.sh
@@ -22,6 +22,10 @@ $pm2 restart all.json
 should 'should stop processes' 'online' 6
 should 'should all script been restarted one time' 'restart_time: 1' 6
 
+$pm2 kill
+
+sleep 2
+
 #
 # CWD OPTION
 #

diff --git a/test/main.sh b/test/main.sh
@@ -23,10 +23,10 @@ bash ./test/bash/log-timestamp.sh
 spec "timetstamp prefix of pm2.log"
 bash ./test/bash/cli.sh
 spec "CLI basic test"
-bash ./test/bash/watch.sh
-spec "Watch feature"
 bash ./test/bash/json_file.sh
 spec "JSON file test"
+bash ./test/bash/watch.sh
+spec "Watch feature"
 bash ./test/bash/harmony.sh
 spec "Harmony test"
 bash ./test/bash/log-custom.sh