Skip to content

Commit 0e19476

Browse files
committed
test: split test in parallel/sequential
Reviewed-By: Ben Noordhuis <[email protected]> PR-URL: #172 Fix: #139
1 parent 165b70f commit 0e19476

File tree

775 files changed

+41
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

775 files changed

+41
-78
lines changed

β€ŽMakefile

+7-4
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,18 @@ distclean:
9090
-rm -rf node_modules
9191

9292
test: all
93-
$(PYTHON) tools/test.py --mode=release simple message
93+
$(PYTHON) tools/test.py --mode=release message parallel sequential
9494
$(MAKE) jslint
9595
$(MAKE) cpplint
9696

97+
test-parallel: all
98+
$(PYTHON) tools/test.py --mode=release parallel -J
99+
97100
test-http1: all
98-
$(PYTHON) tools/test.py --mode=release --use-http1 simple message
101+
$(PYTHON) tools/test.py --mode=release --use-http1 sequential parallel message
99102

100103
test-valgrind: all
101-
$(PYTHON) tools/test.py --mode=release --valgrind simple message
104+
$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
102105

103106
test/gc/node_modules/weak/build/Release/weakref.node:
104107
@if [ ! -f $(NODE_EXE) ]; then make all; fi
@@ -141,7 +144,7 @@ test-message: test-build
141144
$(PYTHON) tools/test.py message
142145

143146
test-simple: all
144-
$(PYTHON) tools/test.py simple
147+
$(PYTHON) tools/test.py parallel sequential
145148

146149
test-pummel: all wrk
147150
$(PYTHON) tools/test.py pummel
File renamed without changes.
File renamed without changes.
File renamed without changes.

β€Žtest/simple/test-beforeexit-event.js renamed to β€Žtest/parallel/test-beforeexit-event.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
var assert = require('assert');
2323
var net = require('net');
2424
var util = require('util');
25+
var common = require('../common');
2526
var revivals = 0;
2627
var deaths = 0;
2728

@@ -49,7 +50,7 @@ function tryTimer() {
4950
function tryListen() {
5051
console.log('create a server');
5152
net.createServer()
52-
.listen(0)
53+
.listen(common.PORT)
5354
.on('listening', function() {
5455
revivals++;
5556
this.close();
File renamed without changes.
File renamed without changes.

β€Žtest/simple/test-cli-eval.js renamed to β€Žtest/parallel/test-cli-eval.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
7373
});
7474

7575
// module path resolve bug, regression test
76-
child.exec(nodejs + ' --eval "require(\'./test/simple/test-cli-eval.js\')"',
76+
child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
7777
function(status, stdout, stderr) {
7878
assert.equal(status.code, 42);
7979
});

β€Žtest/simple/test-cluster-worker-no-exit.js renamed to β€Žtest/parallel/test-cluster-worker-no-exit.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
var assert = require('assert');
2323
var cluster = require('cluster')
2424
var net = require('net');
25+
var common = require('../common');
2526

2627
var destroyed;
2728
var success;
@@ -53,7 +54,7 @@ if (cluster.isMaster) {
5354
success = true;
5455
});
5556

56-
}).listen(0, function() {
57+
}).listen(common.PORT, function() {
5758
var port = this.address().port;
5859

5960
worker = cluster.fork()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

β€Žtest/simple/test-dgram-udp4.js renamed to β€Žtest/parallel/test-dgram-udp4.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var assert = require('assert');
2727

2828
var fs = require('fs'),
2929
dgram = require('dgram'), server, client,
30-
server_port = 20989,
30+
server_port = common.PORT,
3131
message_to_send = 'A message to send',
3232
timer;
3333

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

β€Žtest/simple/test-fs-realpath.js renamed to β€Žtest/parallel/test-fs-realpath.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function test_simple_relative_symlink(callback) {
103103
var entry = common.tmpDir + '/symlink',
104104
expected = common.tmpDir + '/cycles/root.js';
105105
[
106-
[entry, '../tmp/cycles/root.js']
106+
[entry, '../' + common.tmpDirName + '/cycles/root.js']
107107
].forEach(function(t) {
108108
try {fs.unlinkSync(t[0]);}catch (e) {}
109109
console.log('fs.symlinkSync(%j, %j, %j)', t[1], t[0], 'file');
@@ -335,15 +335,16 @@ function test_deep_symlink_mix(callback) {
335335
fs.mkdirSync(tmp('node-test-realpath-d2'), 0700);
336336
try {
337337
[
338-
[entry, '../tmp/node-test-realpath-d1/foo'],
339-
[tmp('node-test-realpath-d1'), '../tmp/node-test-realpath-d2'],
338+
[entry, '../' + common.tmpDirName + '/node-test-realpath-d1/foo'],
339+
[tmp('node-test-realpath-d1'),
340+
'../' + common.tmpDirName + '/node-test-realpath-d2'],
340341
[tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'],
341342
[tmp('node-test-realpath-f2'), fixturesAbsDir +
342343
'/nested-index/one/realpath-c'],
343344
[fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir +
344345
'/nested-index/two/realpath-c'],
345346
[fixturesAbsDir + '/nested-index/two/realpath-c',
346-
'../../../tmp/cycles/root.js']
347+
'../../../' + common.tmpDirName + '/cycles/root.js']
347348
].forEach(function(t) {
348349
//common.debug('setting up '+t[0]+' -> '+t[1]);
349350
try { fs.unlinkSync(t[0]); } catch (e) {}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

β€Žtest/simple/test-http-abort-queued.js renamed to β€Žtest/parallel/test-http-abort-queued.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

2222
var assert = require('assert'),
23+
common = require('../common'),
2324
http = require('http');
2425

2526
var complete;
@@ -38,7 +39,7 @@ var server = http.createServer(function (req, res) {
3839
});
3940

4041

41-
server.listen(0, function () {
42+
server.listen(common.PORT, function () {
4243
console.log('listen', server.address().port);
4344

4445
var agent = new http.Agent({maxSockets: 1});

β€Žtest/simple/test-http-agent-null.js renamed to β€Žtest/parallel/test-http-agent-null.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ process.on('exit', function() {
3434
var server = http.createServer(function(req, res) {
3535
request++;
3636
res.end();
37-
}).listen(function() {
37+
}).listen(common.PORT, function() {
3838
var options = {
3939
agent: null,
4040
port: this.address().port

0 commit comments

Comments
Β (0)