test: split test in parallel/sequential

Reviewed-By: Ben Noordhuis <[email protected]> PR-URL: #172 Fix: #139
nodejs · Dec 17, 2014 · 0e19476 · 0e19476
1 parent 165b70f
commit 0e19476
Show file tree

Hide file tree

Showing 775 changed files with 41 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -90,15 +90,18 @@ distclean:
 	-rm -rf node_modules
 
 test: all
-	$(PYTHON) tools/test.py --mode=release simple message
+	$(PYTHON) tools/test.py --mode=release message parallel sequential
 	$(MAKE) jslint
 	$(MAKE) cpplint
 
+test-parallel: all
+	$(PYTHON) tools/test.py --mode=release parallel -J
+
 test-http1: all
-	$(PYTHON) tools/test.py --mode=release --use-http1 simple message
+	$(PYTHON) tools/test.py --mode=release --use-http1 sequential parallel message
 
 test-valgrind: all
-	$(PYTHON) tools/test.py --mode=release --valgrind simple message
+	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
 test/gc/node_modules/weak/build/Release/weakref.node:
 	@if [ ! -f $(NODE_EXE) ]; then make all; fi
@@ -141,7 +144,7 @@ test-message: test-build
 	$(PYTHON) tools/test.py message
 
 test-simple: all
-	$(PYTHON) tools/test.py simple
+	$(PYTHON) tools/test.py parallel sequential
 
 test-pummel: all wrk
 	$(PYTHON) tools/test.py pummel

diff --git a/test/simple/path.js → test/fixtures/path.js b/test/simple/path.js → test/fixtures/path.js
diff --git a/test/simple/simple.status → test/parallel/simple.status b/test/simple/simple.status → test/parallel/simple.status
diff --git a/test/simple/test-assert.js → test/parallel/test-assert.js b/test/simple/test-assert.js → test/parallel/test-assert.js
diff --git a/test/simple/test-bad-unicode.js → test/parallel/test-bad-unicode.js b/test/simple/test-bad-unicode.js → test/parallel/test-bad-unicode.js
diff --git a/test/simple/test-beforeexit-event-exit.js → test/parallel/test-beforeexit-event-exit.js b/test/simple/test-beforeexit-event-exit.js → test/parallel/test-beforeexit-event-exit.js
diff --git a/test/simple/test-beforeexit-event.js → test/parallel/test-beforeexit-event.js b/test/simple/test-beforeexit-event.js → test/parallel/test-beforeexit-event.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var net = require('net');
 var util = require('util');
+var common = require('../common');
 var revivals = 0;
 var deaths = 0;
 
@@ -49,7 +50,7 @@ function tryTimer() {
 function tryListen() {
   console.log('create a server');
   net.createServer()
-    .listen(0)
+    .listen(common.PORT)
     .on('listening', function() {
       revivals++;
       this.close();

diff --git a/test/simple/test-buffer-ascii.js → test/parallel/test-buffer-ascii.js b/test/simple/test-buffer-ascii.js → test/parallel/test-buffer-ascii.js
diff --git a/test/simple/test-buffer-concat.js → test/parallel/test-buffer-concat.js b/test/simple/test-buffer-concat.js → test/parallel/test-buffer-concat.js
diff --git a/test/simple/test-buffer-inspect.js → test/parallel/test-buffer-inspect.js b/test/simple/test-buffer-inspect.js → test/parallel/test-buffer-inspect.js
diff --git a/test/simple/test-buffer-slice.js → test/parallel/test-buffer-slice.js b/test/simple/test-buffer-slice.js → test/parallel/test-buffer-slice.js
diff --git a/test/simple/test-buffer.js → test/parallel/test-buffer.js b/test/simple/test-buffer.js → test/parallel/test-buffer.js
diff --git a/test/simple/test-c-ares.js → test/parallel/test-c-ares.js b/test/simple/test-c-ares.js → test/parallel/test-c-ares.js
diff --git a/test/simple/test-child-process-buffering.js → .../parallel/test-child-process-buffering.js b/test/simple/test-child-process-buffering.js → .../parallel/test-child-process-buffering.js
diff --git a/test/simple/test-child-process-cwd.js → test/parallel/test-child-process-cwd.js b/test/simple/test-child-process-cwd.js → test/parallel/test-child-process-cwd.js
diff --git a/...ple/test-child-process-default-options.js → ...lel/test-child-process-default-options.js b/...ple/test-child-process-default-options.js → ...lel/test-child-process-default-options.js
diff --git a/test/simple/test-child-process-detached.js → test/parallel/test-child-process-detached.js b/test/simple/test-child-process-detached.js → test/parallel/test-child-process-detached.js
diff --git a/test/simple/test-child-process-disconnect.js → ...parallel/test-child-process-disconnect.js b/test/simple/test-child-process-disconnect.js → ...parallel/test-child-process-disconnect.js
diff --git a/.../simple/test-child-process-double-pipe.js → ...arallel/test-child-process-double-pipe.js b/.../simple/test-child-process-double-pipe.js → ...arallel/test-child-process-double-pipe.js
diff --git a/test/simple/test-child-process-env.js → test/parallel/test-child-process-env.js b/test/simple/test-child-process-env.js → test/parallel/test-child-process-env.js
diff --git a/.../simple/test-child-process-exec-buffer.js → ...arallel/test-child-process-exec-buffer.js b/.../simple/test-child-process-exec-buffer.js → ...arallel/test-child-process-exec-buffer.js
diff --git a/test/simple/test-child-process-exec-cwd.js → test/parallel/test-child-process-exec-cwd.js b/test/simple/test-child-process-exec-cwd.js → test/parallel/test-child-process-exec-cwd.js
diff --git a/test/simple/test-child-process-exec-env.js → test/parallel/test-child-process-exec-env.js b/test/simple/test-child-process-exec-env.js → test/parallel/test-child-process-exec-env.js
diff --git a/test/simple/test-child-process-exec-error.js → ...parallel/test-child-process-exec-error.js b/test/simple/test-child-process-exec-error.js → ...parallel/test-child-process-exec-error.js
diff --git a/test/simple/test-child-process-exit-code.js → .../parallel/test-child-process-exit-code.js b/test/simple/test-child-process-exit-code.js → .../parallel/test-child-process-exit-code.js
diff --git a/...mple/test-child-process-fork-and-spawn.js → ...llel/test-child-process-fork-and-spawn.js b/...mple/test-child-process-fork-and-spawn.js → ...llel/test-child-process-fork-and-spawn.js
diff --git a/test/simple/test-child-process-fork-close.js → ...parallel/test-child-process-fork-close.js b/test/simple/test-child-process-fork-close.js → ...parallel/test-child-process-fork-close.js
diff --git a/test/simple/test-child-process-fork-dgram.js → ...parallel/test-child-process-fork-dgram.js b/test/simple/test-child-process-fork-dgram.js → ...parallel/test-child-process-fork-dgram.js
diff --git a/...mple/test-child-process-fork-exec-argv.js → ...llel/test-child-process-fork-exec-argv.js b/...mple/test-child-process-fork-exec-argv.js → ...llel/test-child-process-fork-exec-argv.js
diff --git a/...mple/test-child-process-fork-exec-path.js → ...llel/test-child-process-fork-exec-path.js b/...mple/test-child-process-fork-exec-path.js → ...llel/test-child-process-fork-exec-path.js
diff --git a/test/simple/test-child-process-fork-net.js → test/parallel/test-child-process-fork-net.js b/test/simple/test-child-process-fork-net.js → test/parallel/test-child-process-fork-net.js
diff --git a/test/simple/test-child-process-fork-net2.js → .../parallel/test-child-process-fork-net2.js b/test/simple/test-child-process-fork-net2.js → .../parallel/test-child-process-fork-net2.js
diff --git a/test/simple/test-child-process-fork-ref.js → test/parallel/test-child-process-fork-ref.js b/test/simple/test-child-process-fork-ref.js → test/parallel/test-child-process-fork-ref.js
diff --git a/test/simple/test-child-process-fork-ref2.js → .../parallel/test-child-process-fork-ref2.js b/test/simple/test-child-process-fork-ref2.js → .../parallel/test-child-process-fork-ref2.js
diff --git a/test/simple/test-child-process-fork.js → test/parallel/test-child-process-fork.js b/test/simple/test-child-process-fork.js → test/parallel/test-child-process-fork.js
diff --git a/test/simple/test-child-process-fork3.js → test/parallel/test-child-process-fork3.js b/test/simple/test-child-process-fork3.js → test/parallel/test-child-process-fork3.js
diff --git a/test/simple/test-child-process-internal.js → test/parallel/test-child-process-internal.js b/test/simple/test-child-process-internal.js → test/parallel/test-child-process-internal.js
diff --git a/test/simple/test-child-process-ipc.js → test/parallel/test-child-process-ipc.js b/test/simple/test-child-process-ipc.js → test/parallel/test-child-process-ipc.js
diff --git a/test/simple/test-child-process-kill.js → test/parallel/test-child-process-kill.js b/test/simple/test-child-process-kill.js → test/parallel/test-child-process-kill.js
diff --git a/.../simple/test-child-process-recv-handle.js → ...arallel/test-child-process-recv-handle.js b/.../simple/test-child-process-recv-handle.js → ...arallel/test-child-process-recv-handle.js
diff --git a/test/simple/test-child-process-send-utf8.js → .../parallel/test-child-process-send-utf8.js b/test/simple/test-child-process-send-utf8.js → .../parallel/test-child-process-send-utf8.js
diff --git a/...simple/test-child-process-set-blocking.js → ...rallel/test-child-process-set-blocking.js b/...simple/test-child-process-set-blocking.js → ...rallel/test-child-process-set-blocking.js
diff --git a/test/simple/test-child-process-silent.js → test/parallel/test-child-process-silent.js b/test/simple/test-child-process-silent.js → test/parallel/test-child-process-silent.js
diff --git a/.../simple/test-child-process-spawn-error.js → ...arallel/test-child-process-spawn-error.js b/.../simple/test-child-process-spawn-error.js → ...arallel/test-child-process-spawn-error.js
diff --git a/...ple/test-child-process-spawn-typeerror.js → ...lel/test-child-process-spawn-typeerror.js b/...ple/test-child-process-spawn-typeerror.js → ...lel/test-child-process-spawn-typeerror.js
diff --git a/...imple/test-child-process-spawnsync-env.js → ...allel/test-child-process-spawnsync-env.js b/...imple/test-child-process-spawnsync-env.js → ...allel/test-child-process-spawnsync-env.js
diff --git a/...ple/test-child-process-spawnsync-input.js → ...lel/test-child-process-spawnsync-input.js b/...ple/test-child-process-spawnsync-input.js → ...lel/test-child-process-spawnsync-input.js
diff --git a/...e/test-child-process-spawnsync-timeout.js → ...l/test-child-process-spawnsync-timeout.js b/...e/test-child-process-spawnsync-timeout.js → ...l/test-child-process-spawnsync-timeout.js
diff --git a/test/simple/test-child-process-spawnsync.js → .../parallel/test-child-process-spawnsync.js b/test/simple/test-child-process-spawnsync.js → .../parallel/test-child-process-spawnsync.js
diff --git a/test/simple/test-child-process-stdin-ipc.js → .../parallel/test-child-process-stdin-ipc.js b/test/simple/test-child-process-stdin-ipc.js → .../parallel/test-child-process-stdin-ipc.js
diff --git a/test/simple/test-child-process-stdin.js → test/parallel/test-child-process-stdin.js b/test/simple/test-child-process-stdin.js → test/parallel/test-child-process-stdin.js
diff --git a/...test-child-process-stdio-big-write-end.js → ...test-child-process-stdio-big-write-end.js b/...test-child-process-stdio-big-write-end.js → ...test-child-process-stdio-big-write-end.js
diff --git a/...imple/test-child-process-stdio-inherit.js → ...allel/test-child-process-stdio-inherit.js b/...imple/test-child-process-stdio-inherit.js → ...allel/test-child-process-stdio-inherit.js
diff --git a/test/simple/test-child-process-stdio.js → test/parallel/test-child-process-stdio.js b/test/simple/test-child-process-stdio.js → test/parallel/test-child-process-stdio.js
diff --git a/...e/test-child-process-stdout-flush-exit.js → ...l/test-child-process-stdout-flush-exit.js b/...e/test-child-process-stdout-flush-exit.js → ...l/test-child-process-stdout-flush-exit.js
diff --git a/...simple/test-child-process-stdout-flush.js → ...rallel/test-child-process-stdout-flush.js b/...simple/test-child-process-stdout-flush.js → ...rallel/test-child-process-stdout-flush.js
diff --git a/test/simple/test-cli-eval.js → test/parallel/test-cli-eval.js b/test/simple/test-cli-eval.js → test/parallel/test-cli-eval.js
@@ -73,7 +73,7 @@ child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
     });
 
 // module path resolve bug, regression test
-child.exec(nodejs + ' --eval "require(\'./test/simple/test-cli-eval.js\')"',
+child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
     function(status, stdout, stderr) {
       assert.equal(status.code, 42);
     });

diff --git a/test/simple/test-cluster-basic.js → test/parallel/test-cluster-basic.js b/test/simple/test-cluster-basic.js → test/parallel/test-cluster-basic.js
diff --git a/...mple/test-cluster-bind-privileged-port.js → ...llel/test-cluster-bind-privileged-port.js b/...mple/test-cluster-bind-privileged-port.js → ...llel/test-cluster-bind-privileged-port.js
diff --git a/test/simple/test-cluster-bind-twice.js → test/parallel/test-cluster-bind-twice.js b/test/simple/test-cluster-bind-twice.js → test/parallel/test-cluster-bind-twice.js
diff --git a/test/simple/test-cluster-dgram-1.js → test/parallel/test-cluster-dgram-1.js b/test/simple/test-cluster-dgram-1.js → test/parallel/test-cluster-dgram-1.js
diff --git a/test/simple/test-cluster-dgram-2.js → test/parallel/test-cluster-dgram-2.js b/test/simple/test-cluster-dgram-2.js → test/parallel/test-cluster-dgram-2.js
diff --git a/...le/test-cluster-disconnect-idle-worker.js → ...el/test-cluster-disconnect-idle-worker.js b/...le/test-cluster-disconnect-idle-worker.js → ...el/test-cluster-disconnect-idle-worker.js
diff --git a/...est-cluster-disconnect-with-no-workers.js → ...est-cluster-disconnect-with-no-workers.js b/...est-cluster-disconnect-with-no-workers.js → ...est-cluster-disconnect-with-no-workers.js
diff --git a/test/simple/test-cluster-disconnect.js → test/parallel/test-cluster-disconnect.js b/test/simple/test-cluster-disconnect.js → test/parallel/test-cluster-disconnect.js
diff --git a/test/simple/test-cluster-eaccess.js → test/parallel/test-cluster-eaccess.js b/test/simple/test-cluster-eaccess.js → test/parallel/test-cluster-eaccess.js
diff --git a/test/simple/test-cluster-eaddrinuse.js → test/parallel/test-cluster-eaddrinuse.js b/test/simple/test-cluster-eaddrinuse.js → test/parallel/test-cluster-eaddrinuse.js
diff --git a/test/simple/test-cluster-fork-env.js → test/parallel/test-cluster-fork-env.js b/test/simple/test-cluster-fork-env.js → test/parallel/test-cluster-fork-env.js
diff --git a/test/simple/test-cluster-http-pipe.js → test/parallel/test-cluster-http-pipe.js b/test/simple/test-cluster-http-pipe.js → test/parallel/test-cluster-http-pipe.js
diff --git a/test/simple/test-cluster-master-error.js → test/parallel/test-cluster-master-error.js b/test/simple/test-cluster-master-error.js → test/parallel/test-cluster-master-error.js
diff --git a/test/simple/test-cluster-master-kill.js → test/parallel/test-cluster-master-kill.js b/test/simple/test-cluster-master-kill.js → test/parallel/test-cluster-master-kill.js
diff --git a/test/simple/test-cluster-message.js → test/parallel/test-cluster-message.js b/test/simple/test-cluster-message.js → test/parallel/test-cluster-message.js
diff --git a/test/simple/test-cluster-net-listen.js → test/parallel/test-cluster-net-listen.js b/test/simple/test-cluster-net-listen.js → test/parallel/test-cluster-net-listen.js
diff --git a/test/simple/test-cluster-net-send.js → test/parallel/test-cluster-net-send.js b/test/simple/test-cluster-net-send.js → test/parallel/test-cluster-net-send.js
diff --git a/test/simple/test-cluster-rr-domain-listen.js → ...parallel/test-cluster-rr-domain-listen.js b/test/simple/test-cluster-rr-domain-listen.js → ...parallel/test-cluster-rr-domain-listen.js
diff --git a/test/simple/test-cluster-send-deadlock.js → test/parallel/test-cluster-send-deadlock.js b/test/simple/test-cluster-send-deadlock.js → test/parallel/test-cluster-send-deadlock.js
diff --git a/.../simple/test-cluster-send-handle-twice.js → ...arallel/test-cluster-send-handle-twice.js b/.../simple/test-cluster-send-handle-twice.js → ...arallel/test-cluster-send-handle-twice.js
diff --git a/.../simple/test-cluster-setup-master-argv.js → ...arallel/test-cluster-setup-master-argv.js b/.../simple/test-cluster-setup-master-argv.js → ...arallel/test-cluster-setup-master-argv.js
diff --git a/...e/test-cluster-setup-master-cumulative.js → ...l/test-cluster-setup-master-cumulative.js b/...e/test-cluster-setup-master-cumulative.js → ...l/test-cluster-setup-master-cumulative.js
diff --git a/.../simple/test-cluster-setup-master-emit.js → ...arallel/test-cluster-setup-master-emit.js b/.../simple/test-cluster-setup-master-emit.js → ...arallel/test-cluster-setup-master-emit.js
diff --git a/...ple/test-cluster-setup-master-multiple.js → ...lel/test-cluster-setup-master-multiple.js b/...ple/test-cluster-setup-master-multiple.js → ...lel/test-cluster-setup-master-multiple.js
diff --git a/test/simple/test-cluster-setup-master.js → test/parallel/test-cluster-setup-master.js b/test/simple/test-cluster-setup-master.js → test/parallel/test-cluster-setup-master.js
diff --git a/.../test-cluster-shared-handle-bind-error.js → .../test-cluster-shared-handle-bind-error.js b/.../test-cluster-shared-handle-bind-error.js → .../test-cluster-shared-handle-bind-error.js
diff --git a/...ter-shared-handle-bind-privileged-port.js → ...ter-shared-handle-bind-privileged-port.js b/...ter-shared-handle-bind-privileged-port.js → ...ter-shared-handle-bind-privileged-port.js
diff --git a/...simple/test-cluster-uncaught-exception.js → ...rallel/test-cluster-uncaught-exception.js b/...simple/test-cluster-uncaught-exception.js → ...rallel/test-cluster-uncaught-exception.js
diff --git a/...simple/test-cluster-worker-constructor.js → ...rallel/test-cluster-worker-constructor.js b/...simple/test-cluster-worker-constructor.js → ...rallel/test-cluster-worker-constructor.js
diff --git a/test/simple/test-cluster-worker-death.js → test/parallel/test-cluster-worker-death.js b/test/simple/test-cluster-worker-death.js → test/parallel/test-cluster-worker-death.js
diff --git a/test/simple/test-cluster-worker-destroy.js → test/parallel/test-cluster-worker-destroy.js b/test/simple/test-cluster-worker-destroy.js → test/parallel/test-cluster-worker-destroy.js
diff --git a/.../simple/test-cluster-worker-disconnect.js → ...arallel/test-cluster-worker-disconnect.js b/.../simple/test-cluster-worker-disconnect.js → ...arallel/test-cluster-worker-disconnect.js
diff --git a/test/simple/test-cluster-worker-events.js → test/parallel/test-cluster-worker-events.js b/test/simple/test-cluster-worker-events.js → test/parallel/test-cluster-worker-events.js
diff --git a/test/simple/test-cluster-worker-exit.js → test/parallel/test-cluster-worker-exit.js b/test/simple/test-cluster-worker-exit.js → test/parallel/test-cluster-worker-exit.js
diff --git a/...simple/test-cluster-worker-forced-exit.js → ...rallel/test-cluster-worker-forced-exit.js b/...simple/test-cluster-worker-forced-exit.js → ...rallel/test-cluster-worker-forced-exit.js
diff --git a/test/simple/test-cluster-worker-init.js → test/parallel/test-cluster-worker-init.js b/test/simple/test-cluster-worker-init.js → test/parallel/test-cluster-worker-init.js
diff --git a/...simple/test-cluster-worker-isconnected.js → ...rallel/test-cluster-worker-isconnected.js b/...simple/test-cluster-worker-isconnected.js → ...rallel/test-cluster-worker-isconnected.js
diff --git a/test/simple/test-cluster-worker-isdead.js → test/parallel/test-cluster-worker-isdead.js b/test/simple/test-cluster-worker-isdead.js → test/parallel/test-cluster-worker-isdead.js
diff --git a/test/simple/test-cluster-worker-kill.js → test/parallel/test-cluster-worker-kill.js b/test/simple/test-cluster-worker-kill.js → test/parallel/test-cluster-worker-kill.js
diff --git a/test/simple/test-cluster-worker-no-exit.js → test/parallel/test-cluster-worker-no-exit.js b/test/simple/test-cluster-worker-no-exit.js → test/parallel/test-cluster-worker-no-exit.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var cluster = require('cluster')
 var net = require('net');
+var common = require('../common');
 
 var destroyed;
 var success;
@@ -53,7 +54,7 @@ if (cluster.isMaster) {
       success = true;
     });
 
-  }).listen(0, function() {
+  }).listen(common.PORT, function() {
     var port = this.address().port;
 
     worker = cluster.fork()

diff --git a/test/simple/test-common.js → test/parallel/test-common.js b/test/simple/test-common.js → test/parallel/test-common.js
diff --git a/test/simple/test-console-instance.js → test/parallel/test-console-instance.js b/test/simple/test-console-instance.js → test/parallel/test-console-instance.js
diff --git a/.../simple/test-console-not-call-toString.js → ...arallel/test-console-not-call-toString.js b/.../simple/test-console-not-call-toString.js → ...arallel/test-console-not-call-toString.js
diff --git a/test/simple/test-console.js → test/parallel/test-console.js b/test/simple/test-console.js → test/parallel/test-console.js
diff --git a/test/simple/test-crypto-authenticated.js → test/parallel/test-crypto-authenticated.js b/test/simple/test-crypto-authenticated.js → test/parallel/test-crypto-authenticated.js
diff --git a/test/simple/test-crypto-binary-default.js → test/parallel/test-crypto-binary-default.js b/test/simple/test-crypto-binary-default.js → test/parallel/test-crypto-binary-default.js
diff --git a/test/simple/test-crypto-certificate.js → test/parallel/test-crypto-certificate.js b/test/simple/test-crypto-certificate.js → test/parallel/test-crypto-certificate.js
diff --git a/test/simple/test-crypto-dh-odd-key.js → test/parallel/test-crypto-dh-odd-key.js b/test/simple/test-crypto-dh-odd-key.js → test/parallel/test-crypto-dh-odd-key.js
diff --git a/test/simple/test-crypto-domain.js → test/parallel/test-crypto-domain.js b/test/simple/test-crypto-domain.js → test/parallel/test-crypto-domain.js
diff --git a/test/simple/test-crypto-domains.js → test/parallel/test-crypto-domains.js b/test/simple/test-crypto-domains.js → test/parallel/test-crypto-domains.js
diff --git a/test/simple/test-crypto-ecb.js → test/parallel/test-crypto-ecb.js b/test/simple/test-crypto-ecb.js → test/parallel/test-crypto-ecb.js
diff --git a/test/simple/test-crypto-from-binary.js → test/parallel/test-crypto-from-binary.js b/test/simple/test-crypto-from-binary.js → test/parallel/test-crypto-from-binary.js
diff --git a/test/simple/test-crypto-hash-stream-pipe.js → .../parallel/test-crypto-hash-stream-pipe.js b/test/simple/test-crypto-hash-stream-pipe.js → .../parallel/test-crypto-hash-stream-pipe.js
diff --git a/test/simple/test-crypto-padding-aes256.js → test/parallel/test-crypto-padding-aes256.js b/test/simple/test-crypto-padding-aes256.js → test/parallel/test-crypto-padding-aes256.js
diff --git a/test/simple/test-crypto-padding.js → test/parallel/test-crypto-padding.js b/test/simple/test-crypto-padding.js → test/parallel/test-crypto-padding.js
diff --git a/test/simple/test-crypto-random.js → test/parallel/test-crypto-random.js b/test/simple/test-crypto-random.js → test/parallel/test-crypto-random.js
diff --git a/test/simple/test-crypto-stream.js → test/parallel/test-crypto-stream.js b/test/simple/test-crypto-stream.js → test/parallel/test-crypto-stream.js
diff --git a/test/simple/test-crypto-verify-failure.js → test/parallel/test-crypto-verify-failure.js b/test/simple/test-crypto-verify-failure.js → test/parallel/test-crypto-verify-failure.js
diff --git a/test/simple/test-crypto.js → test/parallel/test-crypto.js b/test/simple/test-crypto.js → test/parallel/test-crypto.js
diff --git a/test/simple/test-delayed-require.js → test/parallel/test-delayed-require.js b/test/simple/test-delayed-require.js → test/parallel/test-delayed-require.js
diff --git a/test/simple/test-dgram-address.js → test/parallel/test-dgram-address.js b/test/simple/test-dgram-address.js → test/parallel/test-dgram-address.js
diff --git a/...simple/test-dgram-bind-default-address.js → ...rallel/test-dgram-bind-default-address.js b/...simple/test-dgram-bind-default-address.js → ...rallel/test-dgram-bind-default-address.js
diff --git a/test/simple/test-dgram-bind-shared-ports.js → .../parallel/test-dgram-bind-shared-ports.js b/test/simple/test-dgram-bind-shared-ports.js → .../parallel/test-dgram-bind-shared-ports.js
diff --git a/test/simple/test-dgram-bind.js → test/parallel/test-dgram-bind.js b/test/simple/test-dgram-bind.js → test/parallel/test-dgram-bind.js
diff --git a/...ple/test-dgram-broadcast-multi-process.js → ...lel/test-dgram-broadcast-multi-process.js b/...ple/test-dgram-broadcast-multi-process.js → ...lel/test-dgram-broadcast-multi-process.js
diff --git a/test/simple/test-dgram-bytes-length.js → test/parallel/test-dgram-bytes-length.js b/test/simple/test-dgram-bytes-length.js → test/parallel/test-dgram-bytes-length.js
diff --git a/test/simple/test-dgram-close.js → test/parallel/test-dgram-close.js b/test/simple/test-dgram-close.js → test/parallel/test-dgram-close.js
diff --git a/test/simple/test-dgram-empty-packet.js → test/parallel/test-dgram-empty-packet.js b/test/simple/test-dgram-empty-packet.js → test/parallel/test-dgram-empty-packet.js
diff --git a/test/simple/test-dgram-implicit-bind.js → test/parallel/test-dgram-implicit-bind.js b/test/simple/test-dgram-implicit-bind.js → test/parallel/test-dgram-implicit-bind.js
diff --git a/test/simple/test-dgram-listen-after-bind.js → .../parallel/test-dgram-listen-after-bind.js b/test/simple/test-dgram-listen-after-bind.js → .../parallel/test-dgram-listen-after-bind.js
diff --git a/test/simple/test-dgram-msgsize.js → test/parallel/test-dgram-msgsize.js b/test/simple/test-dgram-msgsize.js → test/parallel/test-dgram-msgsize.js
diff --git a/test/simple/test-dgram-multicast-setTTL.js → test/parallel/test-dgram-multicast-setTTL.js b/test/simple/test-dgram-multicast-setTTL.js → test/parallel/test-dgram-multicast-setTTL.js
diff --git a/test/simple/test-dgram-oob-buffer.js → test/parallel/test-dgram-oob-buffer.js b/test/simple/test-dgram-oob-buffer.js → test/parallel/test-dgram-oob-buffer.js
diff --git a/test/simple/test-dgram-pingpong.js → test/parallel/test-dgram-pingpong.js b/test/simple/test-dgram-pingpong.js → test/parallel/test-dgram-pingpong.js
diff --git a/test/simple/test-dgram-ref.js → test/parallel/test-dgram-ref.js b/test/simple/test-dgram-ref.js → test/parallel/test-dgram-ref.js
diff --git a/test/simple/test-dgram-regress-4496.js → test/parallel/test-dgram-regress-4496.js b/test/simple/test-dgram-regress-4496.js → test/parallel/test-dgram-regress-4496.js
diff --git a/test/simple/test-dgram-send-bad-arguments.js → ...parallel/test-dgram-send-bad-arguments.js b/test/simple/test-dgram-send-bad-arguments.js → ...parallel/test-dgram-send-bad-arguments.js
diff --git a/...test-dgram-send-callback-buffer-length.js → ...test-dgram-send-callback-buffer-length.js b/...test-dgram-send-callback-buffer-length.js → ...test-dgram-send-callback-buffer-length.js
diff --git a/test/simple/test-dgram-send-empty-buffer.js → .../parallel/test-dgram-send-empty-buffer.js b/test/simple/test-dgram-send-empty-buffer.js → .../parallel/test-dgram-send-empty-buffer.js
diff --git a/test/simple/test-dgram-udp4.js → test/parallel/test-dgram-udp4.js b/test/simple/test-dgram-udp4.js → test/parallel/test-dgram-udp4.js
@@ -27,7 +27,7 @@ var assert = require('assert');
 
 var fs = require('fs'),
     dgram = require('dgram'), server, client,
-    server_port = 20989,
+    server_port = common.PORT,
     message_to_send = 'A message to send',
     timer;
 

diff --git a/test/simple/test-dgram-unref.js → test/parallel/test-dgram-unref.js b/test/simple/test-dgram-unref.js → test/parallel/test-dgram-unref.js
diff --git a/test/simple/test-dh-padding.js → test/parallel/test-dh-padding.js b/test/simple/test-dh-padding.js → test/parallel/test-dh-padding.js
diff --git a/test/simple/test-dns-cares-domains.js → test/parallel/test-dns-cares-domains.js b/test/simple/test-dns-cares-domains.js → test/parallel/test-dns-cares-domains.js
diff --git a/test/simple/test-dns-lookup-cb-error.js → test/parallel/test-dns-lookup-cb-error.js b/test/simple/test-dns-lookup-cb-error.js → test/parallel/test-dns-lookup-cb-error.js
diff --git a/test/simple/test-dns-regress-6244.js → test/parallel/test-dns-regress-6244.js b/test/simple/test-dns-regress-6244.js → test/parallel/test-dns-regress-6244.js
diff --git a/test/simple/test-dns-regress-7070.js → test/parallel/test-dns-regress-7070.js b/test/simple/test-dns-regress-7070.js → test/parallel/test-dns-regress-7070.js
diff --git a/test/simple/test-dns.js → test/parallel/test-dns.js b/test/simple/test-dns.js → test/parallel/test-dns.js
diff --git a/test/simple/test-domain-crypto.js → test/parallel/test-domain-crypto.js b/test/simple/test-domain-crypto.js → test/parallel/test-domain-crypto.js
diff --git a/test/simple/test-domain-enter-exit.js → test/parallel/test-domain-enter-exit.js b/test/simple/test-domain-enter-exit.js → test/parallel/test-domain-enter-exit.js
diff --git a/.../simple/test-domain-exit-dispose-again.js → ...arallel/test-domain-exit-dispose-again.js b/.../simple/test-domain-exit-dispose-again.js → ...arallel/test-domain-exit-dispose-again.js
diff --git a/test/simple/test-domain-exit-dispose.js → test/parallel/test-domain-exit-dispose.js b/test/simple/test-domain-exit-dispose.js → test/parallel/test-domain-exit-dispose.js
diff --git a/test/simple/test-domain-from-timer.js → test/parallel/test-domain-from-timer.js b/test/simple/test-domain-from-timer.js → test/parallel/test-domain-from-timer.js
diff --git a/test/simple/test-domain-http-server.js → test/parallel/test-domain-http-server.js b/test/simple/test-domain-http-server.js → test/parallel/test-domain-http-server.js
diff --git a/test/simple/test-domain-implicit-fs.js → test/parallel/test-domain-implicit-fs.js b/test/simple/test-domain-implicit-fs.js → test/parallel/test-domain-implicit-fs.js
diff --git a/test/simple/test-domain-multi.js → test/parallel/test-domain-multi.js b/test/simple/test-domain-multi.js → test/parallel/test-domain-multi.js
diff --git a/test/simple/test-domain-nested-throw.js → test/parallel/test-domain-nested-throw.js b/test/simple/test-domain-nested-throw.js → test/parallel/test-domain-nested-throw.js
diff --git a/test/simple/test-domain-nested.js → test/parallel/test-domain-nested.js b/test/simple/test-domain-nested.js → test/parallel/test-domain-nested.js
diff --git a/test/simple/test-domain-safe-exit.js → test/parallel/test-domain-safe-exit.js b/test/simple/test-domain-safe-exit.js → test/parallel/test-domain-safe-exit.js
diff --git a/test/simple/test-domain-stack.js → test/parallel/test-domain-stack.js b/test/simple/test-domain-stack.js → test/parallel/test-domain-stack.js
diff --git a/test/simple/test-domain-timers.js → test/parallel/test-domain-timers.js b/test/simple/test-domain-timers.js → test/parallel/test-domain-timers.js
diff --git a/test/simple/test-domain.js → test/parallel/test-domain.js b/test/simple/test-domain.js → test/parallel/test-domain.js
diff --git a/test/simple/test-error-reporting.js → test/parallel/test-error-reporting.js b/test/simple/test-error-reporting.js → test/parallel/test-error-reporting.js
diff --git a/test/simple/test-eval-require.js → test/parallel/test-eval-require.js b/test/simple/test-eval-require.js → test/parallel/test-eval-require.js
diff --git a/test/simple/test-eval.js → test/parallel/test-eval.js b/test/simple/test-eval.js → test/parallel/test-eval.js
diff --git a/...imple/test-event-emitter-add-listeners.js → ...allel/test-event-emitter-add-listeners.js b/...imple/test-event-emitter-add-listeners.js → ...allel/test-event-emitter-add-listeners.js
diff --git a/...est-event-emitter-check-listener-leaks.js → ...est-event-emitter-check-listener-leaks.js b/...est-event-emitter-check-listener-leaks.js → ...est-event-emitter-check-listener-leaks.js
diff --git a/...e/test-event-emitter-get-max-listeners.js → ...l/test-event-emitter-get-max-listeners.js b/...e/test-event-emitter-get-max-listeners.js → ...l/test-event-emitter-get-max-listeners.js
diff --git a/...t-event-emitter-listeners-side-effects.js → ...t-event-emitter-listeners-side-effects.js b/...t-event-emitter-listeners-side-effects.js → ...t-event-emitter-listeners-side-effects.js
diff --git a/test/simple/test-event-emitter-listeners.js → .../parallel/test-event-emitter-listeners.js b/test/simple/test-event-emitter-listeners.js → .../parallel/test-event-emitter-listeners.js
diff --git a/...imple/test-event-emitter-max-listeners.js → ...allel/test-event-emitter-max-listeners.js b/...imple/test-event-emitter-max-listeners.js → ...allel/test-event-emitter-max-listeners.js
diff --git a/...simple/test-event-emitter-method-names.js → ...rallel/test-event-emitter-method-names.js b/...simple/test-event-emitter-method-names.js → ...rallel/test-event-emitter-method-names.js
diff --git a/...mple/test-event-emitter-modify-in-emit.js → ...llel/test-event-emitter-modify-in-emit.js b/...mple/test-event-emitter-modify-in-emit.js → ...llel/test-event-emitter-modify-in-emit.js
diff --git a/...itter-no-error-provided-to-error-event.js → ...itter-no-error-provided-to-error-event.js b/...itter-no-error-provided-to-error-event.js → ...itter-no-error-provided-to-error-event.js
diff --git a/test/simple/test-event-emitter-num-args.js → test/parallel/test-event-emitter-num-args.js b/test/simple/test-event-emitter-num-args.js → test/parallel/test-event-emitter-num-args.js
diff --git a/test/simple/test-event-emitter-once.js → test/parallel/test-event-emitter-once.js b/test/simple/test-event-emitter-once.js → test/parallel/test-event-emitter-once.js
diff --git a/...est-event-emitter-remove-all-listeners.js → ...est-event-emitter-remove-all-listeners.js b/...est-event-emitter-remove-all-listeners.js → ...est-event-emitter-remove-all-listeners.js
diff --git a/...le/test-event-emitter-remove-listeners.js → ...el/test-event-emitter-remove-listeners.js b/...le/test-event-emitter-remove-listeners.js → ...el/test-event-emitter-remove-listeners.js
diff --git a/...emitter-set-max-listeners-side-effects.js → ...emitter-set-max-listeners-side-effects.js b/...emitter-set-max-listeners-side-effects.js → ...emitter-set-max-listeners-side-effects.js
diff --git a/test/simple/test-event-emitter-subclass.js → test/parallel/test-event-emitter-subclass.js b/test/simple/test-event-emitter-subclass.js → test/parallel/test-event-emitter-subclass.js
diff --git a/test/simple/test-exception-handler.js → test/parallel/test-exception-handler.js b/test/simple/test-exception-handler.js → test/parallel/test-exception-handler.js
diff --git a/test/simple/test-exception-handler2.js → test/parallel/test-exception-handler2.js b/test/simple/test-exception-handler2.js → test/parallel/test-exception-handler2.js
diff --git a/test/simple/test-exec-max-buffer.js → test/parallel/test-exec-max-buffer.js b/test/simple/test-exec-max-buffer.js → test/parallel/test-exec-max-buffer.js
diff --git a/test/simple/test-file-read-noexist.js → test/parallel/test-file-read-noexist.js b/test/simple/test-file-read-noexist.js → test/parallel/test-file-read-noexist.js
diff --git a/test/simple/test-file-write-stream.js → test/parallel/test-file-write-stream.js b/test/simple/test-file-write-stream.js → test/parallel/test-file-write-stream.js
diff --git a/test/simple/test-file-write-stream2.js → test/parallel/test-file-write-stream2.js b/test/simple/test-file-write-stream2.js → test/parallel/test-file-write-stream2.js
diff --git a/test/simple/test-file-write-stream3.js → test/parallel/test-file-write-stream3.js b/test/simple/test-file-write-stream3.js → test/parallel/test-file-write-stream3.js
diff --git a/test/simple/test-fs-access.js → test/parallel/test-fs-access.js b/test/simple/test-fs-access.js → test/parallel/test-fs-access.js
diff --git a/test/simple/test-fs-append-file-sync.js → test/parallel/test-fs-append-file-sync.js b/test/simple/test-fs-append-file-sync.js → test/parallel/test-fs-append-file-sync.js
diff --git a/test/simple/test-fs-append-file.js → test/parallel/test-fs-append-file.js b/test/simple/test-fs-append-file.js → test/parallel/test-fs-append-file.js
diff --git a/test/simple/test-fs-chmod.js → test/parallel/test-fs-chmod.js b/test/simple/test-fs-chmod.js → test/parallel/test-fs-chmod.js
diff --git a/test/simple/test-fs-empty-readStream.js → test/parallel/test-fs-empty-readStream.js b/test/simple/test-fs-empty-readStream.js → test/parallel/test-fs-empty-readStream.js
diff --git a/test/simple/test-fs-error-messages.js → test/parallel/test-fs-error-messages.js b/test/simple/test-fs-error-messages.js → test/parallel/test-fs-error-messages.js
diff --git a/test/simple/test-fs-exists.js → test/parallel/test-fs-exists.js b/test/simple/test-fs-exists.js → test/parallel/test-fs-exists.js
diff --git a/test/simple/test-fs-fsync.js → test/parallel/test-fs-fsync.js b/test/simple/test-fs-fsync.js → test/parallel/test-fs-fsync.js
diff --git a/test/simple/test-fs-long-path.js → test/parallel/test-fs-long-path.js b/test/simple/test-fs-long-path.js → test/parallel/test-fs-long-path.js
diff --git a/test/simple/test-fs-mkdir.js → test/parallel/test-fs-mkdir.js b/test/simple/test-fs-mkdir.js → test/parallel/test-fs-mkdir.js
diff --git a/...ple/test-fs-non-number-arguments-throw.js → ...lel/test-fs-non-number-arguments-throw.js b/...ple/test-fs-non-number-arguments-throw.js → ...lel/test-fs-non-number-arguments-throw.js
diff --git a/test/simple/test-fs-null-bytes.js → test/parallel/test-fs-null-bytes.js b/test/simple/test-fs-null-bytes.js → test/parallel/test-fs-null-bytes.js
diff --git a/test/simple/test-fs-open-flags.js → test/parallel/test-fs-open-flags.js b/test/simple/test-fs-open-flags.js → test/parallel/test-fs-open-flags.js
diff --git a/test/simple/test-fs-open.js → test/parallel/test-fs-open.js b/test/simple/test-fs-open.js → test/parallel/test-fs-open.js
diff --git a/test/simple/test-fs-read-buffer.js → test/parallel/test-fs-read-buffer.js b/test/simple/test-fs-read-buffer.js → test/parallel/test-fs-read-buffer.js
diff --git a/...simple/test-fs-read-file-sync-hostname.js → ...rallel/test-fs-read-file-sync-hostname.js b/...simple/test-fs-read-file-sync-hostname.js → ...rallel/test-fs-read-file-sync-hostname.js
diff --git a/test/simple/test-fs-read-file-sync.js → test/parallel/test-fs-read-file-sync.js b/test/simple/test-fs-read-file-sync.js → test/parallel/test-fs-read-file-sync.js
diff --git a/test/simple/test-fs-read-stream-err.js → test/parallel/test-fs-read-stream-err.js b/test/simple/test-fs-read-stream-err.js → test/parallel/test-fs-read-stream-err.js
diff --git a/test/simple/test-fs-read-stream-fd.js → test/parallel/test-fs-read-stream-fd.js b/test/simple/test-fs-read-stream-fd.js → test/parallel/test-fs-read-stream-fd.js
diff --git a/test/simple/test-fs-read-stream-resume.js → test/parallel/test-fs-read-stream-resume.js b/test/simple/test-fs-read-stream-resume.js → test/parallel/test-fs-read-stream-resume.js
diff --git a/test/simple/test-fs-read-stream.js → test/parallel/test-fs-read-stream.js b/test/simple/test-fs-read-stream.js → test/parallel/test-fs-read-stream.js
diff --git a/test/simple/test-fs-read.js → test/parallel/test-fs-read.js b/test/simple/test-fs-read.js → test/parallel/test-fs-read.js
diff --git a/test/simple/test-fs-readfile-empty.js → test/parallel/test-fs-readfile-empty.js b/test/simple/test-fs-readfile-empty.js → test/parallel/test-fs-readfile-empty.js
diff --git a/test/simple/test-fs-readfile-error.js → test/parallel/test-fs-readfile-error.js b/test/simple/test-fs-readfile-error.js → test/parallel/test-fs-readfile-error.js
diff --git a/test/simple/test-fs-readfile-pipe.js → test/parallel/test-fs-readfile-pipe.js b/test/simple/test-fs-readfile-pipe.js → test/parallel/test-fs-readfile-pipe.js
diff --git a/test/simple/test-fs-readfile-unlink.js → test/parallel/test-fs-readfile-unlink.js b/test/simple/test-fs-readfile-unlink.js → test/parallel/test-fs-readfile-unlink.js
diff --git a/...simple/test-fs-readfile-zero-byte-liar.js → ...rallel/test-fs-readfile-zero-byte-liar.js b/...simple/test-fs-readfile-zero-byte-liar.js → ...rallel/test-fs-readfile-zero-byte-liar.js
diff --git a/test/simple/test-fs-realpath.js → test/parallel/test-fs-realpath.js b/test/simple/test-fs-realpath.js → test/parallel/test-fs-realpath.js
@@ -103,7 +103,7 @@ function test_simple_relative_symlink(callback) {
   var entry = common.tmpDir + '/symlink',
       expected = common.tmpDir + '/cycles/root.js';
   [
-    [entry, '../tmp/cycles/root.js']
+    [entry, '../' + common.tmpDirName + '/cycles/root.js']
   ].forEach(function(t) {
     try {fs.unlinkSync(t[0]);}catch (e) {}
     console.log('fs.symlinkSync(%j, %j, %j)', t[1], t[0], 'file');
@@ -335,15 +335,16 @@ function test_deep_symlink_mix(callback) {
   fs.mkdirSync(tmp('node-test-realpath-d2'), 0700);
   try {
     [
-      [entry, '../tmp/node-test-realpath-d1/foo'],
-      [tmp('node-test-realpath-d1'), '../tmp/node-test-realpath-d2'],
+      [entry, '../' + common.tmpDirName + '/node-test-realpath-d1/foo'],
+      [tmp('node-test-realpath-d1'),
+          '../' + common.tmpDirName + '/node-test-realpath-d2'],
       [tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'],
       [tmp('node-test-realpath-f2'), fixturesAbsDir +
            '/nested-index/one/realpath-c'],
       [fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir +
             '/nested-index/two/realpath-c'],
       [fixturesAbsDir + '/nested-index/two/realpath-c',
-        '../../../tmp/cycles/root.js']
+        '../../../' + common.tmpDirName + '/cycles/root.js']
     ].forEach(function(t) {
       //common.debug('setting up '+t[0]+' -> '+t[1]);
       try { fs.unlinkSync(t[0]); } catch (e) {}

diff --git a/test/simple/test-fs-sir-writes-alot.js → test/parallel/test-fs-sir-writes-alot.js b/test/simple/test-fs-sir-writes-alot.js → test/parallel/test-fs-sir-writes-alot.js
diff --git a/test/simple/test-fs-stat.js → test/parallel/test-fs-stat.js b/test/simple/test-fs-stat.js → test/parallel/test-fs-stat.js
diff --git a/test/simple/test-fs-stream-double-close.js → test/parallel/test-fs-stream-double-close.js b/test/simple/test-fs-stream-double-close.js → test/parallel/test-fs-stream-double-close.js
diff --git a/.../test-fs-symlink-dir-junction-relative.js → .../test-fs-symlink-dir-junction-relative.js b/.../test-fs-symlink-dir-junction-relative.js → .../test-fs-symlink-dir-junction-relative.js
diff --git a/test/simple/test-fs-symlink-dir-junction.js → .../parallel/test-fs-symlink-dir-junction.js b/test/simple/test-fs-symlink-dir-junction.js → .../parallel/test-fs-symlink-dir-junction.js
diff --git a/test/simple/test-fs-symlink.js → test/parallel/test-fs-symlink.js b/test/simple/test-fs-symlink.js → test/parallel/test-fs-symlink.js
diff --git a/test/simple/test-fs-sync-fd-leak.js → test/parallel/test-fs-sync-fd-leak.js b/test/simple/test-fs-sync-fd-leak.js → test/parallel/test-fs-sync-fd-leak.js
diff --git a/test/simple/test-fs-truncate-GH-6233.js → test/parallel/test-fs-truncate-GH-6233.js b/test/simple/test-fs-truncate-GH-6233.js → test/parallel/test-fs-truncate-GH-6233.js
diff --git a/test/simple/test-fs-truncate.js → test/parallel/test-fs-truncate.js b/test/simple/test-fs-truncate.js → test/parallel/test-fs-truncate.js
diff --git a/test/simple/test-fs-utimes.js → test/parallel/test-fs-utimes.js b/test/simple/test-fs-utimes.js → test/parallel/test-fs-utimes.js
diff --git a/test/simple/test-fs-write-buffer.js → test/parallel/test-fs-write-buffer.js b/test/simple/test-fs-write-buffer.js → test/parallel/test-fs-write-buffer.js
diff --git a/test/simple/test-fs-write-file-buffer.js → test/parallel/test-fs-write-file-buffer.js b/test/simple/test-fs-write-file-buffer.js → test/parallel/test-fs-write-file-buffer.js
diff --git a/test/simple/test-fs-write-file-sync.js → test/parallel/test-fs-write-file-sync.js b/test/simple/test-fs-write-file-sync.js → test/parallel/test-fs-write-file-sync.js
diff --git a/test/simple/test-fs-write-file.js → test/parallel/test-fs-write-file.js b/test/simple/test-fs-write-file.js → test/parallel/test-fs-write-file.js
diff --git a/...imple/test-fs-write-stream-change-open.js → ...allel/test-fs-write-stream-change-open.js b/...imple/test-fs-write-stream-change-open.js → ...allel/test-fs-write-stream-change-open.js
diff --git a/test/simple/test-fs-write-stream-end.js → test/parallel/test-fs-write-stream-end.js b/test/simple/test-fs-write-stream-end.js → test/parallel/test-fs-write-stream-end.js
diff --git a/test/simple/test-fs-write-stream-err.js → test/parallel/test-fs-write-stream-err.js b/test/simple/test-fs-write-stream-err.js → test/parallel/test-fs-write-stream-err.js
diff --git a/test/simple/test-fs-write-stream.js → test/parallel/test-fs-write-stream.js b/test/simple/test-fs-write-stream.js → test/parallel/test-fs-write-stream.js
diff --git a/test/simple/test-fs-write-sync.js → test/parallel/test-fs-write-sync.js b/test/simple/test-fs-write-sync.js → test/parallel/test-fs-write-sync.js
diff --git a/test/simple/test-fs-write.js → test/parallel/test-fs-write.js b/test/simple/test-fs-write.js → test/parallel/test-fs-write.js
diff --git a/test/simple/test-global.js → test/parallel/test-global.js b/test/simple/test-global.js → test/parallel/test-global.js
diff --git a/test/simple/test-handle-wrap-close-abort.js → .../parallel/test-handle-wrap-close-abort.js b/test/simple/test-handle-wrap-close-abort.js → .../parallel/test-handle-wrap-close-abort.js
diff --git a/test/simple/test-http-1.0-keep-alive.js → test/parallel/test-http-1.0-keep-alive.js b/test/simple/test-http-1.0-keep-alive.js → test/parallel/test-http-1.0-keep-alive.js
diff --git a/test/simple/test-http-1.0.js → test/parallel/test-http-1.0.js b/test/simple/test-http-1.0.js → test/parallel/test-http-1.0.js
diff --git a/test/simple/test-http-304.js → test/parallel/test-http-304.js b/test/simple/test-http-304.js → test/parallel/test-http-304.js
diff --git a/test/simple/test-http-abort-before-end.js → test/parallel/test-http-abort-before-end.js b/test/simple/test-http-abort-before-end.js → test/parallel/test-http-abort-before-end.js
diff --git a/test/simple/test-http-abort-client.js → test/parallel/test-http-abort-client.js b/test/simple/test-http-abort-client.js → test/parallel/test-http-abort-client.js
diff --git a/test/simple/test-http-abort-queued.js → test/parallel/test-http-abort-queued.js b/test/simple/test-http-abort-queued.js → test/parallel/test-http-abort-queued.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var assert = require('assert'),
+    common = require('../common'),
     http = require('http');
 
 var complete;
@@ -38,7 +39,7 @@ var server = http.createServer(function (req, res) {
 });
 
 
-server.listen(0, function () {
+server.listen(common.PORT, function () {
   console.log('listen', server.address().port);
 
   var agent = new http.Agent({maxSockets: 1});

diff --git a/test/simple/test-http-after-connect.js → test/parallel/test-http-after-connect.js b/test/simple/test-http-after-connect.js → test/parallel/test-http-after-connect.js
diff --git a/...imple/test-http-agent-destroyed-socket.js → ...allel/test-http-agent-destroyed-socket.js b/...imple/test-http-agent-destroyed-socket.js → ...allel/test-http-agent-destroyed-socket.js
diff --git a/test/simple/test-http-agent-false.js → test/parallel/test-http-agent-false.js b/test/simple/test-http-agent-false.js → test/parallel/test-http-agent-false.js
diff --git a/test/simple/test-http-agent-keepalive.js → test/parallel/test-http-agent-keepalive.js b/test/simple/test-http-agent-keepalive.js → test/parallel/test-http-agent-keepalive.js
diff --git a/test/simple/test-http-agent-no-protocol.js → test/parallel/test-http-agent-no-protocol.js b/test/simple/test-http-agent-no-protocol.js → test/parallel/test-http-agent-no-protocol.js
diff --git a/test/simple/test-http-agent-null.js → test/parallel/test-http-agent-null.js b/test/simple/test-http-agent-null.js → test/parallel/test-http-agent-null.js
@@ -34,7 +34,7 @@ process.on('exit', function() {
 var server = http.createServer(function(req, res) {
   request++;
   res.end();
-}).listen(function() {
+}).listen(common.PORT, function() {
   var options = {
     agent: null,
     port: this.address().port

diff --git a/test/simple/test-http-agent.js → test/parallel/test-http-agent.js b/test/simple/test-http-agent.js → test/parallel/test-http-agent.js
diff --git a/...mple/test-http-allow-req-after-204-res.js → ...llel/test-http-allow-req-after-204-res.js b/...mple/test-http-allow-req-after-204-res.js → ...llel/test-http-allow-req-after-204-res.js
diff --git a/test/simple/test-http-bind-twice.js → test/parallel/test-http-bind-twice.js b/test/simple/test-http-bind-twice.js → test/parallel/test-http-bind-twice.js
diff --git a/test/simple/test-http-blank-header.js → test/parallel/test-http-blank-header.js b/test/simple/test-http-blank-header.js → test/parallel/test-http-blank-header.js
diff --git a/test/simple/test-http-buffer-sanity.js → test/parallel/test-http-buffer-sanity.js b/test/simple/test-http-buffer-sanity.js → test/parallel/test-http-buffer-sanity.js
diff --git a/test/simple/test-http-byteswritten.js → test/parallel/test-http-byteswritten.js b/test/simple/test-http-byteswritten.js → test/parallel/test-http-byteswritten.js
diff --git a/test/simple/test-http-chunked-304.js → test/parallel/test-http-chunked-304.js b/test/simple/test-http-chunked-304.js → test/parallel/test-http-chunked-304.js
diff --git a/test/simple/test-http-chunked.js → test/parallel/test-http-chunked.js b/test/simple/test-http-chunked.js → test/parallel/test-http-chunked.js
diff --git a/test/simple/test-http-client-abort.js → test/parallel/test-http-client-abort.js b/test/simple/test-http-client-abort.js → test/parallel/test-http-client-abort.js
diff --git a/test/simple/test-http-client-abort2.js → test/parallel/test-http-client-abort2.js b/test/simple/test-http-client-abort2.js → test/parallel/test-http-client-abort2.js
diff --git a/test/simple/test-http-client-agent.js → test/parallel/test-http-client-agent.js b/test/simple/test-http-client-agent.js → test/parallel/test-http-client-agent.js
diff --git a/...test-http-client-default-headers-exist.js → ...test-http-client-default-headers-exist.js b/...test-http-client-default-headers-exist.js → ...test-http-client-default-headers-exist.js
diff --git a/test/simple/test-http-client-encoding.js → test/parallel/test-http-client-encoding.js b/test/simple/test-http-client-encoding.js → test/parallel/test-http-client-encoding.js
diff --git a/test/simple/test-http-client-get-url.js → test/parallel/test-http-client-get-url.js b/test/simple/test-http-client-get-url.js → test/parallel/test-http-client-get-url.js
diff --git a/test/simple/test-http-client-parse-error.js → .../parallel/test-http-client-parse-error.js b/test/simple/test-http-client-parse-error.js → .../parallel/test-http-client-parse-error.js
diff --git a/test/simple/test-http-client-pipe-end.js → test/parallel/test-http-client-pipe-end.js b/test/simple/test-http-client-pipe-end.js → test/parallel/test-http-client-pipe-end.js
diff --git a/test/simple/test-http-client-race-2.js → test/parallel/test-http-client-race-2.js b/test/simple/test-http-client-race-2.js → test/parallel/test-http-client-race-2.js
diff --git a/test/simple/test-http-client-race.js → test/parallel/test-http-client-race.js b/test/simple/test-http-client-race.js → test/parallel/test-http-client-race.js
diff --git a/test/simple/test-http-client-readable.js → test/parallel/test-http-client-readable.js b/test/simple/test-http-client-readable.js → test/parallel/test-http-client-readable.js
diff --git a/...imple/test-http-client-response-domain.js → ...allel/test-http-client-response-domain.js b/...imple/test-http-client-response-domain.js → ...allel/test-http-client-response-domain.js
diff --git a/.../simple/test-http-client-timeout-agent.js → ...arallel/test-http-client-timeout-agent.js b/.../simple/test-http-client-timeout-agent.js → ...arallel/test-http-client-timeout-agent.js
diff --git a/.../simple/test-http-client-timeout-event.js → ...arallel/test-http-client-timeout-event.js b/.../simple/test-http-client-timeout-event.js → ...arallel/test-http-client-timeout-event.js
diff --git a/...ple/test-http-client-timeout-with-data.js → ...lel/test-http-client-timeout-with-data.js b/...ple/test-http-client-timeout-with-data.js → ...lel/test-http-client-timeout-with-data.js
diff --git a/test/simple/test-http-client-timeout.js → test/parallel/test-http-client-timeout.js b/test/simple/test-http-client-timeout.js → test/parallel/test-http-client-timeout.js
diff --git a/...simple/test-http-client-unescaped-path.js → ...rallel/test-http-client-unescaped-path.js b/...simple/test-http-client-unescaped-path.js → ...rallel/test-http-client-unescaped-path.js
diff --git a/test/simple/test-http-client-upload-buf.js → test/parallel/test-http-client-upload-buf.js b/test/simple/test-http-client-upload-buf.js → test/parallel/test-http-client-upload-buf.js
diff --git a/test/simple/test-http-client-upload.js → test/parallel/test-http-client-upload.js b/test/simple/test-http-client-upload.js → test/parallel/test-http-client-upload.js
diff --git a/test/simple/test-http-conn-reset.js → test/parallel/test-http-conn-reset.js b/test/simple/test-http-conn-reset.js → test/parallel/test-http-conn-reset.js
diff --git a/test/simple/test-http-connect.js → test/parallel/test-http-connect.js b/test/simple/test-http-connect.js → test/parallel/test-http-connect.js
diff --git a/test/simple/test-http-contentLength0.js → test/parallel/test-http-contentLength0.js b/test/simple/test-http-contentLength0.js → test/parallel/test-http-contentLength0.js
diff --git a/test/simple/test-http-createConnection.js → test/parallel/test-http-createConnection.js b/test/simple/test-http-createConnection.js → test/parallel/test-http-createConnection.js
diff --git a/test/simple/test-http-curl-chunk-problem.js → .../parallel/test-http-curl-chunk-problem.js b/test/simple/test-http-curl-chunk-problem.js → .../parallel/test-http-curl-chunk-problem.js
diff --git a/test/simple/test-http-date-header.js → test/parallel/test-http-date-header.js b/test/simple/test-http-date-header.js → test/parallel/test-http-date-header.js
diff --git a/test/simple/test-http-default-encoding.js → test/parallel/test-http-default-encoding.js b/test/simple/test-http-default-encoding.js → test/parallel/test-http-default-encoding.js
diff --git a/test/simple/test-http-default-port.js → test/parallel/test-http-default-port.js b/test/simple/test-http-default-port.js → test/parallel/test-http-default-port.js
diff --git a/...mple/test-http-destroyed-socket-write2.js → ...llel/test-http-destroyed-socket-write2.js b/...mple/test-http-destroyed-socket-write2.js → ...llel/test-http-destroyed-socket-write2.js
diff --git a/test/simple/test-http-dns-error.js → test/parallel/test-http-dns-error.js b/test/simple/test-http-dns-error.js → test/parallel/test-http-dns-error.js
diff --git a/...le/test-http-end-throw-socket-handling.js → ...el/test-http-end-throw-socket-handling.js b/...le/test-http-end-throw-socket-handling.js → ...el/test-http-end-throw-socket-handling.js
diff --git a/test/simple/test-http-eof-on-connect.js → test/parallel/test-http-eof-on-connect.js b/test/simple/test-http-eof-on-connect.js → test/parallel/test-http-eof-on-connect.js
diff --git a/test/simple/test-http-exceptions.js → test/parallel/test-http-exceptions.js b/test/simple/test-http-exceptions.js → test/parallel/test-http-exceptions.js
diff --git a/test/simple/test-http-exit-delay.js → test/parallel/test-http-exit-delay.js b/test/simple/test-http-exit-delay.js → test/parallel/test-http-exit-delay.js
diff --git a/test/simple/test-http-expect-continue.js → test/parallel/test-http-expect-continue.js b/test/simple/test-http-expect-continue.js → test/parallel/test-http-expect-continue.js
diff --git a/test/simple/test-http-extra-response.js → test/parallel/test-http-extra-response.js b/test/simple/test-http-extra-response.js → test/parallel/test-http-extra-response.js
diff --git a/test/simple/test-http-flush.js → test/parallel/test-http-flush.js b/test/simple/test-http-flush.js → test/parallel/test-http-flush.js
diff --git a/test/simple/test-http-full-response.js → test/parallel/test-http-full-response.js b/test/simple/test-http-full-response.js → test/parallel/test-http-full-response.js
diff --git a/.../simple/test-http-get-pipeline-problem.js → ...arallel/test-http-get-pipeline-problem.js b/.../simple/test-http-get-pipeline-problem.js → ...arallel/test-http-get-pipeline-problem.js
diff --git a/test/simple/test-http-head-request.js → test/parallel/test-http-head-request.js b/test/simple/test-http-head-request.js → test/parallel/test-http-head-request.js
diff --git a/...est-http-head-response-has-no-body-end.js → ...est-http-head-response-has-no-body-end.js b/...est-http-head-response-has-no-body-end.js → ...est-http-head-response-has-no-body-end.js
diff --git a/...le/test-http-head-response-has-no-body.js → ...el/test-http-head-response-has-no-body.js b/...le/test-http-head-response-has-no-body.js → ...el/test-http-head-response-has-no-body.js
diff --git a/test/simple/test-http-header-read.js → test/parallel/test-http-header-read.js b/test/simple/test-http-header-read.js → test/parallel/test-http-header-read.js
diff --git a/...le/test-http-header-response-splitting.js → ...el/test-http-header-response-splitting.js b/...le/test-http-header-response-splitting.js → ...el/test-http-header-response-splitting.js
diff --git a/test/simple/test-http-hex-write.js → test/parallel/test-http-hex-write.js b/test/simple/test-http-hex-write.js → test/parallel/test-http-hex-write.js
diff --git a/test/simple/test-http-host-headers.js → test/parallel/test-http-host-headers.js b/test/simple/test-http-host-headers.js → test/parallel/test-http-host-headers.js
diff --git a/...http-incoming-pipelined-socket-destroy.js → ...http-incoming-pipelined-socket-destroy.js b/...http-incoming-pipelined-socket-destroy.js → ...http-incoming-pipelined-socket-destroy.js
diff --git a/...e/test-http-keep-alive-close-on-header.js → ...l/test-http-keep-alive-close-on-header.js b/...e/test-http-keep-alive-close-on-header.js → ...l/test-http-keep-alive-close-on-header.js