Skip to content

Commit e4d36db

Browse files
committed
tryfix
1 parent ae64ce7 commit e4d36db

File tree

3 files changed

+62
-65
lines changed

3 files changed

+62
-65
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"main": "index.js",
9292
"types": "types/index.d.ts",
9393
"scripts": {
94-
"test": "bash test/unit.sh && bash test/e2e.sh"
94+
"test": "bash test/e2e.sh"
9595
},
9696
"keywords": [
9797
"cli",

test/e2e.sh

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -11,66 +11,66 @@ set -e
1111
touch e2e_time
1212
> e2e_time
1313

14-
# CLI
15-
runTest ./test/e2e/cli/reload.sh
16-
runTest ./test/e2e/cli/start-app.sh
17-
runTest ./test/e2e/cli/operate-regex.sh
18-
runTest ./test/e2e/cli/interpreter.sh
19-
runTest ./test/e2e/cli/app-configuration.sh
20-
runTest ./test/e2e/cli/binary.sh
21-
runTest ./test/e2e/cli/startOrX.sh
22-
runTest ./test/e2e/cli/reset.sh
23-
runTest ./test/e2e/cli/env-refresh.sh
24-
runTest ./test/e2e/cli/extra-lang.sh
25-
runTest ./test/e2e/cli/python-support.sh
26-
runTest ./test/e2e/cli/multiparam.sh
27-
runTest ./test/e2e/cli/smart-start.sh
28-
runTest ./test/e2e/cli/args.sh
29-
runTest ./test/e2e/cli/attach.sh
30-
runTest ./test/e2e/cli/serve.sh
31-
runTest ./test/e2e/cli/monit.sh
32-
runTest ./test/e2e/cli/cli-actions-1.sh
33-
runTest ./test/e2e/cli/cli-actions-2.sh
34-
runTest ./test/e2e/cli/dump.sh
35-
runTest ./test/e2e/cli/resurrect.sh
36-
runTest ./test/e2e/cli/watch.sh
37-
runTest ./test/e2e/cli/right-exit-code.sh
38-
runTest ./test/e2e/cli/fork.sh
39-
runTest ./test/e2e/cli/piped-config.sh
14+
# # CLI
15+
# runTest ./test/e2e/cli/reload.sh
16+
# runTest ./test/e2e/cli/start-app.sh
17+
# runTest ./test/e2e/cli/operate-regex.sh
18+
# runTest ./test/e2e/cli/interpreter.sh
19+
# runTest ./test/e2e/cli/app-configuration.sh
20+
# runTest ./test/e2e/cli/binary.sh
21+
# runTest ./test/e2e/cli/startOrX.sh
22+
# runTest ./test/e2e/cli/reset.sh
23+
# runTest ./test/e2e/cli/env-refresh.sh
24+
# runTest ./test/e2e/cli/extra-lang.sh
25+
# runTest ./test/e2e/cli/python-support.sh
26+
# runTest ./test/e2e/cli/multiparam.sh
27+
# runTest ./test/e2e/cli/smart-start.sh
28+
# runTest ./test/e2e/cli/args.sh
29+
# runTest ./test/e2e/cli/attach.sh
30+
# runTest ./test/e2e/cli/serve.sh
31+
# runTest ./test/e2e/cli/monit.sh
32+
# runTest ./test/e2e/cli/cli-actions-1.sh
33+
# runTest ./test/e2e/cli/cli-actions-2.sh
34+
# runTest ./test/e2e/cli/dump.sh
35+
# runTest ./test/e2e/cli/resurrect.sh
36+
# runTest ./test/e2e/cli/watch.sh
37+
# runTest ./test/e2e/cli/right-exit-code.sh
38+
# runTest ./test/e2e/cli/fork.sh
39+
# runTest ./test/e2e/cli/piped-config.sh
4040

41-
# PROCESS FILES
42-
runTest ./test/e2e/process-file/json-file.sh
43-
runTest ./test/e2e/process-file/yaml-configuration.sh
44-
runTest ./test/e2e/process-file/json-reload.sh
45-
runTest ./test/e2e/process-file/homogen-json-action.sh
46-
runTest ./test/e2e/process-file/app-config-update.sh
47-
runTest ./test/e2e/process-file/js-configuration.sh
41+
# # PROCESS FILES
42+
# runTest ./test/e2e/process-file/json-file.sh
43+
# runTest ./test/e2e/process-file/yaml-configuration.sh
44+
# runTest ./test/e2e/process-file/json-reload.sh
45+
# runTest ./test/e2e/process-file/homogen-json-action.sh
46+
# runTest ./test/e2e/process-file/app-config-update.sh
47+
# runTest ./test/e2e/process-file/js-configuration.sh
4848

49-
# BINARIES
50-
runTest ./test/e2e/binaries/pm2-dev.sh
51-
runTest ./test/e2e/binaries/pm2-runtime.sh
49+
# # BINARIES
50+
# runTest ./test/e2e/binaries/pm2-dev.sh
51+
# runTest ./test/e2e/binaries/pm2-runtime.sh
5252

53-
# INTERNALS
54-
runTest ./test/e2e/internals/wait-ready-event.sh
55-
runTest ./test/e2e/internals/daemon-paths-override.sh
56-
runTest ./test/e2e/internals/source_map.sh
57-
runTest ./test/e2e/internals/wrapped-fork.sh
58-
runTest ./test/e2e/internals/infinite-loop.sh
59-
runTest ./test/e2e/internals/options-via-env.sh
60-
runTest ./test/e2e/internals/promise.sh
61-
runTest ./test/e2e/internals/increment-var.sh
62-
runTest ./test/e2e/internals/start-consistency.sh
53+
# # INTERNALS
54+
# runTest ./test/e2e/internals/wait-ready-event.sh
55+
# runTest ./test/e2e/internals/daemon-paths-override.sh
56+
# runTest ./test/e2e/internals/source_map.sh
57+
# runTest ./test/e2e/internals/wrapped-fork.sh
58+
# runTest ./test/e2e/internals/infinite-loop.sh
59+
# runTest ./test/e2e/internals/options-via-env.sh
60+
# runTest ./test/e2e/internals/promise.sh
61+
# runTest ./test/e2e/internals/increment-var.sh
62+
# runTest ./test/e2e/internals/start-consistency.sh
6363

64-
# MISC
65-
runTest ./test/e2e/misc/inside-pm2.sh
66-
runTest ./test/e2e/misc/vizion.sh
67-
runTest ./test/e2e/misc/misc.sh
68-
runTest ./test/e2e/misc/versioning-cmd.sh
69-
runTest ./test/e2e/misc/instance-number.sh
70-
runTest ./test/e2e/misc/startup.sh
71-
runTest ./test/e2e/misc/nvm-node-version.sh
72-
runTest ./test/e2e/misc/port-release.sh
73-
runTest ./test/e2e/misc/cron-system.sh
64+
# # MISC
65+
# runTest ./test/e2e/misc/inside-pm2.sh
66+
# runTest ./test/e2e/misc/vizion.sh
67+
# runTest ./test/e2e/misc/misc.sh
68+
# runTest ./test/e2e/misc/versioning-cmd.sh
69+
# runTest ./test/e2e/misc/instance-number.sh
70+
# runTest ./test/e2e/misc/startup.sh
71+
# runTest ./test/e2e/misc/nvm-node-version.sh
72+
# runTest ./test/e2e/misc/port-release.sh
73+
# runTest ./test/e2e/misc/cron-system.sh
7474

7575
# LOGS
7676
runTest ./test/e2e/logs/log-timestamp.sh

test/e2e/logs/log-timestamp.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ function rm_pm2log {
1313
fi
1414
}
1515
function grep_log {
16-
eval "$pm2 $1"
17-
sleep 0.3
18-
OUT=`cat ~/.pm2/pm2.log | grep -n "[0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}" | wc -l`
1916

17+
echo "travis"
18+
eval "$pm2 $1 >| pm2.log"
19+
sleep 0.3
20+
OUT=`cat pm2.log | grep -n "[0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}" | wc -l`
2021
}
2122
function no_prefix {
2223
eval "grep_log \"$1\""
@@ -40,11 +41,7 @@ $pm2 kill
4041

4142
sleep 0.5
4243

43-
if [ -z $TRAVIS ]
44-
then
45-
echo "removing pm2.log"
46-
rm -rf ~/.pm2/pm2.log
47-
fi
44+
$pm2 flush
4845

4946
unset PM2_LOG_DATE_FORMAT
5047
export PM2_LOG_DATE_FORMAT=""

0 commit comments

Comments
 (0)