refactor: parallelize bash test

Unitech · Feb 26, 2018 · d4b4375 · d4b4375
1 parent beb6e48
commit d4b4375
Show file tree

Hide file tree

Showing 81 changed files with 197 additions and 215 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,7 @@ os:
   - linux
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install python3
   - sudo apt-get install php5-cli
+  - sudo apt-get install parallel
 services:
   - docker
-notifications:
-  slack: pm2-nodejs:5Lolyw2LMnwy8fziqOGILQxG
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
   "main": "index.js",
   "types": "types/index.d.ts",
   "scripts": {
-    "test": "NODE_ENV=test bash test/pm2_check_dependencies.sh && NODE_ENV=test bash test/pm2_programmatic_tests.sh && NODE_ENV=test bash test/pm2_behavior_tests.sh",
+    "test": "bash test/docker_parallel_test.sh",
     "bench-pmx": "pm2 delete all; pm2 install pm2-probe; node examples/pmx/app.js; pm2 ls"
   },
   "keywords": [

diff --git a/test/Dockerfile b/test/Dockerfile
@@ -1,9 +1,12 @@
-FROM node:9
+FROM node:alpine
 
 RUN mkdir -p /var/pm2
 
 WORKDIR /var/pm2
 
+ENV NODE_ENV test
+RUN apk update && apk add bash git curl python3 php5 && rm -rf /var/cache/apk/*
+RUN ln -s /usr/bin/php5 /usr/bin/php
 RUN npm install -g mocha@3.5
 
 CMD ["mocha", "./test/programmatic/api.mocha.js"]
diff --git a/test/bash/interact.sh → test/bash/agent/interact.sh b/test/bash/interact.sh → test/bash/agent/interact.sh
diff --git a/test/bash/pm2-dev.sh → test/bash/binaries/pm2-dev.sh b/test/bash/pm2-dev.sh → test/bash/binaries/pm2-dev.sh
@@ -1,9 +1,21 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
-pm2dev="`type -P node` `pwd`/bin/pm2-dev"
+
+pm2_path=`pwd`/bin/pm2-dev
+
+if [ ! -f $pm2_path ];
+then
+    pm2_path=`pwd`/../bin/pm2-dev
+    if [ ! -f $pm2_path ];
+    then
+        pm2_path=`pwd`/../../bin/pm2-dev
+    fi
+fi
+
+pm2dev="`type -P node` $pm2_path"
 
 export PM2_HOME=$HOME'/.pm2-dev'
 

diff --git a/test/bash/pm2-runtime.sh → test/bash/binaries/pm2-runtime.sh b/test/bash/pm2-runtime.sh → test/bash/binaries/pm2-runtime.sh
@@ -1,9 +1,21 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
-pm2_runtime="`type -P node` `pwd`/bin/pm2-runtime"
+
+pm2_path=`pwd`/bin/pm2-runtime
+
+if [ ! -f $pm2_path ];
+then
+    pm2_path=`pwd`/../bin/pm2-runtime
+    if [ ! -f $pm2_path ];
+    then
+        pm2_path=`pwd`/../../bin/pm2-runtime
+    fi
+fi
+
+pm2_runtime="`type -P node` $pm2_path"
 
 export PM2_RUNTIME_DEBUG='true'
 

diff --git a/test/bash/cli-ux.sh b/test/bash/cli-ux.sh
diff --git a/test/bash/app-config-update.sh → test/bash/cli/app-config-update.sh b/test/bash/app-config-update.sh → test/bash/cli/app-config-update.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 export PM2_GRACEFUL_TIMEOUT=1000
 export PM2_GRACEFUL_LISTEN_TIMEOUT=1000

diff --git a/test/bash/app-configuration.sh → test/bash/cli/app-configuration.sh b/test/bash/app-configuration.sh → test/bash/cli/app-configuration.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 echo -e "\033[1mRunning tests:\033[0m"
 

diff --git a/test/bash/args.sh → test/bash/cli/args.sh b/test/bash/args.sh → test/bash/cli/args.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path/args
 

diff --git a/test/bash/attach.sh → test/bash/cli/attach.sh b/test/bash/attach.sh → test/bash/cli/attach.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 echo -e "\033[1mRunning tests:\033[0m"
 

diff --git a/test/bash/binary.sh → test/bash/cli/binary.sh b/test/bash/binary.sh → test/bash/cli/binary.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 echo -e "\033[1mRunning tests:\033[0m"
 

diff --git a/test/bash/cli-actions-1.sh → test/bash/cli/cli-actions-1.sh b/test/bash/cli-actions-1.sh → test/bash/cli/cli-actions-1.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/cli-actions-2.sh → test/bash/cli/cli-actions-2.sh b/test/bash/cli-actions-2.sh → test/bash/cli/cli-actions-2.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/env-refresh.sh → test/bash/cli/env-refresh.sh b/test/bash/env-refresh.sh → test/bash/cli/env-refresh.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 cd $file_path
 
 echo -e "\033[1mENV REFRESH\033[0m"

diff --git a/test/bash/extra-lang.sh → test/bash/cli/extra-lang.sh b/test/bash/extra-lang.sh → test/bash/cli/extra-lang.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path/extra-lang
 

diff --git a/test/bash/fork.sh → test/bash/cli/fork.sh b/test/bash/fork.sh → test/bash/cli/fork.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/harmony.sh → test/bash/cli/harmony.sh b/test/bash/harmony.sh → test/bash/cli/harmony.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/interpreter.sh → test/bash/cli/interpreter.sh b/test/bash/interpreter.sh → test/bash/cli/interpreter.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path/interpreter
 
@@ -41,36 +41,36 @@ should 'process should be online' "status: 'online'" 1
 
 ########## LIVESCRIPT
 
-$pm2 delete all
-$pm2 start echo.ls
-sleep 1
-should 'process should be errored without livescript installed' "status: 'errored'" 1
+# $pm2 delete all
+# $pm2 start echo.ls
+# sleep 1
+# should 'process should be errored without livescript installed' "status: 'errored'" 1
 
-########### Install
+# ########### Install
 
-$pm2 install livescript
+# $pm2 install livescript
 
-########### livescript fork test
-$pm2 delete all
+# ########### livescript fork test
+# $pm2 delete all
 
->livescript.log
+# >livescript.log
 
-$pm2 start echo.ls -o livescript.log --merge-logs
+# $pm2 start echo.ls -o livescript.log --merge-logs
 
-sleep 1.5
-grep "Hello Livescript!" livescript.log
-spec "Should work on Livescript files in fork mode"
+# sleep 1.5
+# grep "Hello Livescript!" livescript.log
+# spec "Should work on Livescript files in fork mode"
 
-########### livescript cluster test
-$pm2 delete all
+# ########### livescript cluster test
+# $pm2 delete all
 
->livescript.log
+# >livescript.log
 
-$pm2 start echo.ls -i 1 -o livescript.log --merge-logs
+# $pm2 start echo.ls -i 1 -o livescript.log --merge-logs
 
-sleep 1.5
-grep "Hello Livescript!" livescript.log
-spec "Should work on Livescript files in cluster mode"
+# sleep 1.5
+# grep "Hello Livescript!" livescript.log
+# spec "Should work on Livescript files in cluster mode"
 
 ########### TYPESCRIPT
 
@@ -81,27 +81,27 @@ should 'process should be errored without typescript installed' "status: 'errore
 
 ########### Install
 
-# $pm2 install typescript
+$pm2 install typescript
 
 ########### typescript fork test
-# $pm2 delete all
+$pm2 delete all
 
-# >typescript.log
+>typescript.log
 
-# $pm2 start echo.ts -o typescript.log --merge-logs
+$pm2 start echo.ts -o typescript.log --merge-logs
 
-# sleep 1.5
+sleep 1.5
 
-# grep "Hello Typescript!" typescript.log
-# spec "Should work on Typescript files in fork mode"
+grep "Hello Typescript!" typescript.log
+spec "Should work on Typescript files in fork mode"
 
 ########### typescript cluster test
-# $pm2 delete all
+$pm2 delete all
 
-# >typescript.log
+>typescript.log
 
-# $pm2 start echo.ts -i 1 -o typescript.log --merge-logs
+$pm2 start echo.ts -i 1 -o typescript.log --merge-logs
 
-# sleep 1.5
-# grep "Hello Typescript!" typescript.log
-# spec "Should work on Typescript files in cluster mode"
+sleep 1.5
+grep "Hello Typescript!" typescript.log
+spec "Should work on Typescript files in cluster mode"
diff --git a/test/bash/mjs.sh → test/bash/cli/mjs.sh b/test/bash/mjs.sh → test/bash/cli/mjs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path/mjs
 

diff --git a/test/bash/monit.sh → test/bash/cli/monit.sh b/test/bash/monit.sh → test/bash/cli/monit.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/multiparam.sh → test/bash/cli/multiparam.sh b/test/bash/multiparam.sh → test/bash/cli/multiparam.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/operate-regex.sh → test/bash/cli/operate-regex.sh b/test/bash/operate-regex.sh → test/bash/cli/operate-regex.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 
@@ -24,4 +24,3 @@ should 'should have stopped 1 apps' 'online' 0
 $pm2 restart /echo-[1,2]/
 
 should 'should have restarted 2 apps' 'online' 2
-
diff --git a/test/bash/piped-config.sh → test/bash/cli/piped-config.sh b/test/bash/piped-config.sh → test/bash/cli/piped-config.sh
@@ -2,7 +2,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/reset.sh → test/bash/cli/reset.sh b/test/bash/reset.sh → test/bash/cli/reset.sh
@@ -2,7 +2,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path
 

diff --git a/test/bash/resurrect.sh → test/bash/cli/resurrect.sh b/test/bash/resurrect.sh → test/bash/cli/resurrect.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 cd $file_path
 
 $pm2 start echo.js -i 4

diff --git a/test/bash/right-exit-code.sh → test/bash/cli/right-exit-code.sh b/test/bash/right-exit-code.sh → test/bash/cli/right-exit-code.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SRC=$(cd $(dirname "$0"); pwd)
-source "${SRC}/include.sh"
+source "${SRC}/../include.sh"
 
 cd $file_path