test fix

Unitech · Jun 30, 2020 · c79713c · c79713c
1 parent 9095d2d
commit c79713c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/API.js b/lib/API.js
@@ -1720,11 +1720,11 @@ class API {
         return acc
       }, [])
 
-    if (code != 0 && code != null) {
+    if ((code != 0 && code != null)) {
       return that.exitCli(code ? code : conf.SUCCESS_EXIT);
     }
     // Do nothing if PM2 called programmatically and not called from CLI (also in exitCli)
-    if ((conf.PM2_PROGRAMMATIC && process.env.PM2_USAGE != 'CLI') || process.env.pm_id)
+    if ((conf.PM2_PROGRAMMATIC && process.env.PM2_USAGE != 'CLI'))
       return false;
 
     return that.Client.executeRemote('getSystemData', {}, (err, sys_infos) => {
@@ -1770,7 +1770,7 @@ class API {
         global._auto_exit = true;
         return that.streamLogs('all', 0, false, 'HH:mm:ss', false);
       }
-      else if (!process.env.TRAVIS && acted.length > 0 && (process.stdout.isTTY || commander.attach === true)) {
+      else if (!process.env.TRAVIS && process.env.NODE_ENV != 'test' && acted.length > 0 && (process.stdout.isTTY || commander.attach === true)) {
         Common.info(`Log streaming apps ${chalk.cyan(acted.join(' '))}, exit with Ctrl-C or will exit in 10secs`)
 
         setTimeout(() => {