Skip to content

Commit ca13ded

Browse files
committed
test: skip tests and require when node4
1 parent 59c4b20 commit ca13ded

File tree

7 files changed

+43
-10
lines changed

7 files changed

+43
-10
lines changed

lib/API/Serve.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@ var http = require('http');
88
var url = require('url');
99
var path = require('path');
1010
var debug = require('debug')('pm2:serve');
11-
var probe = require('@pm2/io');
11+
var semver = require('semver')
12+
13+
var isNode4 = require('semver').lt(process.version, '6.0.0')
14+
15+
if (!isNode4) {
16+
var probe = require('@pm2/io');
17+
var errorMeter = probe.meter({
18+
name : '404/sec',
19+
samples : 1,
20+
timeframe : 60
21+
})
22+
}
1223

1324
/**
1425
* list of supported content types.
@@ -186,11 +197,6 @@ var contentTypes = {
186197
'ttf': 'application/font-sfnt'
187198
};
188199

189-
var errorMeter = probe.meter({
190-
name : '404/sec',
191-
samples : 1,
192-
timeframe : 60
193-
});
194200

195201
var options = {
196202
port: process.env.PM2_SERVE_PORT || process.argv[3] || 8080,
@@ -219,7 +225,8 @@ http.createServer(function (request, response) {
219225
if (error) {
220226
console.error('[%s] Error while serving %s with content-type %s : %s',
221227
Date.now(), filePath, contentType, error.message || error);
222-
errorMeter.mark();
228+
if (!isNode4)
229+
errorMeter.mark();
223230
if (error.code === 'ENOENT') {
224231
fs.readFile(options.path + '/404.html', function (err, content) {
225232
content = err ? '404 Not Found' : content;

test/e2e.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ runTest ./test/e2e/cli/smart-start.sh
2828
runTest ./test/e2e/cli/args.sh
2929
runTest ./test/e2e/cli/attach.sh
3030
runTest ./test/e2e/cli/serve.sh
31+
32+
SUPV=`node -e "require('semver').lt(process.versions.node, '6.0.0') ? console.log('<6') : console.log('>6')"`
33+
34+
if [ $SUPV = '<6' ]; then
35+
exit
36+
fi
37+
3138
runTest ./test/e2e/cli/monit.sh
3239
runTest ./test/e2e/cli/cli-actions-1.sh
3340
runTest ./test/e2e/cli/cli-actions-2.sh

test/e2e/cli/app-configuration.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
SRC=$(cd $(dirname "$0"); pwd)
44
source "${SRC}/../include.sh"
55

6+
node -e "require('semver').lt(process.versions.node, '6.0.0') ? process.exit(0) : process.exit(1)"
7+
[ $? -eq 1 ] || exit 0
8+
69
cd $file_path
710

811
$pm2 unset echo

test/e2e/cli/serve.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ OUT=`cat /tmp/tmp_out.txt | grep -o "good shit" | wc -l`
3737
[ $OUT -eq 1 ] || fail "should be listening on port $PORT_2"
3838
success "should be listening on port $PORT_2"
3939

40+
node -e "require('semver').lt(process.versions.node, '6.0.0') ? process.exit(0) : process.exit(1)"
41+
[ $? -eq 1 ] || exit 0
42+
4043
$pm2 delete all
4144

4245
$pm2 serve . $PORT_2 --name frontend

test/interface/bus.fork.spec.mocha.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ var should = require('should');
33
var PM2 = require('../..');
44
var Plan = require('../helpers/plan.js');
55

6+
if (require('semver').lt(process.version, '6.0.0')) {
7+
return process.exit(0)
8+
}
9+
610
var PROCESS_ARCH = Object.keys({
711
pm_id : 0,
812
name : 'app'

test/interface/bus.spec.mocha.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ var should = require('should');
33
var PM2 = require('../..');
44
var Plan = require('../helpers/plan.js');
55

6+
if (require('semver').lt(process.version, '6.0.0')) {
7+
return process.exit(0)
8+
}
9+
610
const PATH_FIXTURES = process.cwd() + '/test/interface/fixtures/';
711

812
var PROCESS_ARCH = Object.keys({
@@ -127,7 +131,7 @@ describe('PM2 BUS / RPC', function() {
127131

128132
it('should (process:exception)', function(done) {
129133
var plan = new Plan(1, done);
130-
let called = false
134+
var called = false
131135

132136
pm2_bus.on('*', function(event, data) {
133137
if (event == 'process:exception') {
@@ -145,7 +149,7 @@ describe('PM2 BUS / RPC', function() {
145149
});
146150

147151
it('should (process:exception) with promise', function(done) {
148-
let called = false
152+
var called = false
149153
pm2_bus.on('*', function(event, data) {
150154
if (event == 'process:exception') {
151155
if (called) return
@@ -162,7 +166,7 @@ describe('PM2 BUS / RPC', function() {
162166
});
163167

164168
it('should (human:event)', function(done) {
165-
let called = false
169+
var called = false
166170
pm2_bus.on('*', function(event, data) {
167171
if (event == 'human:event') {
168172
if (called) return

test/programmatic/custom_action.mocha.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ process.chdir(__dirname);
33

44
var pm2 = require('../..');
55
var should = require('should');
6+
var semver = require('semver')
7+
8+
if (semver.lt(process.version, '6.0.0')) {
9+
return process.exit(0)
10+
}
611

712
describe('Custom actions via CLI/API', function() {
813
before(function(done) {

0 commit comments

Comments
 (0)