nodejs · indutny · Dec 16, 2014 · Dec 16, 2014 · Dec 16, 2014 · Dec 16, 2014
diff --git a/Makefile b/Makefile
@@ -90,7 +90,7 @@ distclean:
 	-rm -rf node_modules
 
 test: all
-	$(PYTHON) tools/test.py --mode=release simple message
+	$(PYTHON) tools/test.py --mode=release simple message io -J
 	$(MAKE) jslint
 	$(MAKE) cpplint
 

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/net-socket-readystate.js → test/io/net-socket-readystate.js b/test/simple/net-socket-readystate.js → test/io/net-socket-readystate.js
diff --git a/test/simple/test-beforeexit-event.js → test/io/test-beforeexit-event.js b/test/simple/test-beforeexit-event.js → test/io/test-beforeexit-event.js
diff --git a/test/simple/test-c-ares.js → test/io/test-c-ares.js b/test/simple/test-c-ares.js → test/io/test-c-ares.js
diff --git a/test/simple/test-chdir.js → test/io/test-chdir.js b/test/simple/test-chdir.js → test/io/test-chdir.js
diff --git a/test/simple/test-child-process-buffering.js → test/io/test-child-process-buffering.js b/test/simple/test-child-process-buffering.js → test/io/test-child-process-buffering.js
diff --git a/test/simple/test-child-process-cwd.js → test/io/test-child-process-cwd.js b/test/simple/test-child-process-cwd.js → test/io/test-child-process-cwd.js
diff --git a/...ple/test-child-process-default-options.js → .../io/test-child-process-default-options.js b/...ple/test-child-process-default-options.js → .../io/test-child-process-default-options.js
diff --git a/test/simple/test-child-process-detached.js → test/io/test-child-process-detached.js b/test/simple/test-child-process-detached.js → test/io/test-child-process-detached.js
diff --git a/test/simple/test-child-process-disconnect.js → test/io/test-child-process-disconnect.js b/test/simple/test-child-process-disconnect.js → test/io/test-child-process-disconnect.js
diff --git a/.../simple/test-child-process-double-pipe.js → test/io/test-child-process-double-pipe.js b/.../simple/test-child-process-double-pipe.js → test/io/test-child-process-double-pipe.js
diff --git a/test/simple/test-child-process-emfile.js → test/io/test-child-process-emfile.js b/test/simple/test-child-process-emfile.js → test/io/test-child-process-emfile.js
diff --git a/test/simple/test-child-process-env.js → test/io/test-child-process-env.js b/test/simple/test-child-process-env.js → test/io/test-child-process-env.js
diff --git a/.../simple/test-child-process-exec-buffer.js → test/io/test-child-process-exec-buffer.js b/.../simple/test-child-process-exec-buffer.js → test/io/test-child-process-exec-buffer.js
diff --git a/test/simple/test-child-process-exec-cwd.js → test/io/test-child-process-exec-cwd.js b/test/simple/test-child-process-exec-cwd.js → test/io/test-child-process-exec-cwd.js
diff --git a/test/simple/test-child-process-exec-env.js → test/io/test-child-process-exec-env.js b/test/simple/test-child-process-exec-env.js → test/io/test-child-process-exec-env.js
diff --git a/test/simple/test-child-process-exec-error.js → test/io/test-child-process-exec-error.js b/test/simple/test-child-process-exec-error.js → test/io/test-child-process-exec-error.js
diff --git a/test/simple/test-child-process-execsync.js → test/io/test-child-process-execsync.js b/test/simple/test-child-process-execsync.js → test/io/test-child-process-execsync.js
diff --git a/test/simple/test-child-process-exit-code.js → test/io/test-child-process-exit-code.js b/test/simple/test-child-process-exit-code.js → test/io/test-child-process-exit-code.js
diff --git a/...mple/test-child-process-fork-and-spawn.js → test/io/test-child-process-fork-and-spawn.js b/...mple/test-child-process-fork-and-spawn.js → test/io/test-child-process-fork-and-spawn.js
diff --git a/test/simple/test-child-process-fork-close.js → test/io/test-child-process-fork-close.js b/test/simple/test-child-process-fork-close.js → test/io/test-child-process-fork-close.js
diff --git a/test/simple/test-child-process-fork-dgram.js → test/io/test-child-process-fork-dgram.js b/test/simple/test-child-process-fork-dgram.js → test/io/test-child-process-fork-dgram.js
diff --git a/...mple/test-child-process-fork-exec-argv.js → test/io/test-child-process-fork-exec-argv.js b/...mple/test-child-process-fork-exec-argv.js → test/io/test-child-process-fork-exec-argv.js
diff --git a/...mple/test-child-process-fork-exec-path.js → test/io/test-child-process-fork-exec-path.js b/...mple/test-child-process-fork-exec-path.js → test/io/test-child-process-fork-exec-path.js
diff --git a/...test-child-process-fork-getconnections.js → ...test-child-process-fork-getconnections.js b/...test-child-process-fork-getconnections.js → ...test-child-process-fork-getconnections.js
diff --git a/test/simple/test-child-process-fork-net.js → test/io/test-child-process-fork-net.js b/test/simple/test-child-process-fork-net.js → test/io/test-child-process-fork-net.js
diff --git a/test/simple/test-child-process-fork-net2.js → test/io/test-child-process-fork-net2.js b/test/simple/test-child-process-fork-net2.js → test/io/test-child-process-fork-net2.js
diff --git a/test/simple/test-child-process-fork-ref.js → test/io/test-child-process-fork-ref.js b/test/simple/test-child-process-fork-ref.js → test/io/test-child-process-fork-ref.js
diff --git a/test/simple/test-child-process-fork-ref2.js → test/io/test-child-process-fork-ref2.js b/test/simple/test-child-process-fork-ref2.js → test/io/test-child-process-fork-ref2.js
diff --git a/test/simple/test-child-process-fork.js → test/io/test-child-process-fork.js b/test/simple/test-child-process-fork.js → test/io/test-child-process-fork.js
diff --git a/test/simple/test-child-process-fork3.js → test/io/test-child-process-fork3.js b/test/simple/test-child-process-fork3.js → test/io/test-child-process-fork3.js
diff --git a/test/simple/test-child-process-internal.js → test/io/test-child-process-internal.js b/test/simple/test-child-process-internal.js → test/io/test-child-process-internal.js
diff --git a/test/simple/test-child-process-ipc.js → test/io/test-child-process-ipc.js b/test/simple/test-child-process-ipc.js → test/io/test-child-process-ipc.js
diff --git a/test/simple/test-child-process-kill.js → test/io/test-child-process-kill.js b/test/simple/test-child-process-kill.js → test/io/test-child-process-kill.js
diff --git a/.../simple/test-child-process-recv-handle.js → test/io/test-child-process-recv-handle.js b/.../simple/test-child-process-recv-handle.js → test/io/test-child-process-recv-handle.js
diff --git a/test/simple/test-child-process-send-utf8.js → test/io/test-child-process-send-utf8.js b/test/simple/test-child-process-send-utf8.js → test/io/test-child-process-send-utf8.js
diff --git a/...simple/test-child-process-set-blocking.js → test/io/test-child-process-set-blocking.js b/...simple/test-child-process-set-blocking.js → test/io/test-child-process-set-blocking.js
diff --git a/test/simple/test-child-process-silent.js → test/io/test-child-process-silent.js b/test/simple/test-child-process-silent.js → test/io/test-child-process-silent.js
diff --git a/.../simple/test-child-process-spawn-error.js → test/io/test-child-process-spawn-error.js b/.../simple/test-child-process-spawn-error.js → test/io/test-child-process-spawn-error.js
diff --git a/...ple/test-child-process-spawn-typeerror.js → .../io/test-child-process-spawn-typeerror.js b/...ple/test-child-process-spawn-typeerror.js → .../io/test-child-process-spawn-typeerror.js
diff --git a/...imple/test-child-process-spawnsync-env.js → test/io/test-child-process-spawnsync-env.js b/...imple/test-child-process-spawnsync-env.js → test/io/test-child-process-spawnsync-env.js
diff --git a/...ple/test-child-process-spawnsync-input.js → .../io/test-child-process-spawnsync-input.js b/...ple/test-child-process-spawnsync-input.js → .../io/test-child-process-spawnsync-input.js
diff --git a/...e/test-child-process-spawnsync-timeout.js → ...o/test-child-process-spawnsync-timeout.js b/...e/test-child-process-spawnsync-timeout.js → ...o/test-child-process-spawnsync-timeout.js
diff --git a/test/simple/test-child-process-spawnsync.js → test/io/test-child-process-spawnsync.js b/test/simple/test-child-process-spawnsync.js → test/io/test-child-process-spawnsync.js
diff --git a/test/simple/test-child-process-stdin-ipc.js → test/io/test-child-process-stdin-ipc.js b/test/simple/test-child-process-stdin-ipc.js → test/io/test-child-process-stdin-ipc.js
diff --git a/test/simple/test-child-process-stdin.js → test/io/test-child-process-stdin.js b/test/simple/test-child-process-stdin.js → test/io/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 → test/io/test-child-process-stdio-inherit.js b/...imple/test-child-process-stdio-inherit.js → test/io/test-child-process-stdio-inherit.js
diff --git a/test/simple/test-child-process-stdio.js → test/io/test-child-process-stdio.js b/test/simple/test-child-process-stdio.js → test/io/test-child-process-stdio.js
diff --git a/...e/test-child-process-stdout-flush-exit.js → ...o/test-child-process-stdout-flush-exit.js b/...e/test-child-process-stdout-flush-exit.js → ...o/test-child-process-stdout-flush-exit.js
diff --git a/...simple/test-child-process-stdout-flush.js → test/io/test-child-process-stdout-flush.js b/...simple/test-child-process-stdout-flush.js → test/io/test-child-process-stdout-flush.js
diff --git a/test/simple/test-cli-eval.js → test/io/test-cli-eval.js b/test/simple/test-cli-eval.js → test/io/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/io/test-cli-eval.js\')"',
     function(status, stdout, stderr) {
       assert.equal(status.code, 42);
     });

diff --git a/test/simple/test-cluster-basic.js → test/io/test-cluster-basic.js b/test/simple/test-cluster-basic.js → test/io/test-cluster-basic.js
diff --git a/...mple/test-cluster-bind-privileged-port.js → test/io/test-cluster-bind-privileged-port.js b/...mple/test-cluster-bind-privileged-port.js → test/io/test-cluster-bind-privileged-port.js
diff --git a/test/simple/test-cluster-bind-twice.js → test/io/test-cluster-bind-twice.js b/test/simple/test-cluster-bind-twice.js → test/io/test-cluster-bind-twice.js
diff --git a/test/simple/test-cluster-dgram-1.js → test/io/test-cluster-dgram-1.js b/test/simple/test-cluster-dgram-1.js → test/io/test-cluster-dgram-1.js
diff --git a/test/simple/test-cluster-dgram-2.js → test/io/test-cluster-dgram-2.js b/test/simple/test-cluster-dgram-2.js → test/io/test-cluster-dgram-2.js
diff --git a/...le/test-cluster-disconnect-idle-worker.js → ...io/test-cluster-disconnect-idle-worker.js b/...le/test-cluster-disconnect-idle-worker.js → ...io/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/io/test-cluster-disconnect.js b/test/simple/test-cluster-disconnect.js → test/io/test-cluster-disconnect.js
diff --git a/test/simple/test-cluster-eaccess.js → test/io/test-cluster-eaccess.js b/test/simple/test-cluster-eaccess.js → test/io/test-cluster-eaccess.js
diff --git a/test/simple/test-cluster-eaddrinuse.js → test/io/test-cluster-eaddrinuse.js b/test/simple/test-cluster-eaddrinuse.js → test/io/test-cluster-eaddrinuse.js
diff --git a/test/simple/test-cluster-fork-env.js → test/io/test-cluster-fork-env.js b/test/simple/test-cluster-fork-env.js → test/io/test-cluster-fork-env.js
diff --git a/test/simple/test-cluster-http-pipe.js → test/io/test-cluster-http-pipe.js b/test/simple/test-cluster-http-pipe.js → test/io/test-cluster-http-pipe.js
diff --git a/test/simple/test-cluster-listening-port.js → test/io/test-cluster-listening-port.js b/test/simple/test-cluster-listening-port.js → test/io/test-cluster-listening-port.js
diff --git a/test/simple/test-cluster-master-error.js → test/io/test-cluster-master-error.js b/test/simple/test-cluster-master-error.js → test/io/test-cluster-master-error.js
diff --git a/test/simple/test-cluster-master-kill.js → test/io/test-cluster-master-kill.js b/test/simple/test-cluster-master-kill.js → test/io/test-cluster-master-kill.js
diff --git a/test/simple/test-cluster-message.js → test/io/test-cluster-message.js b/test/simple/test-cluster-message.js → test/io/test-cluster-message.js
diff --git a/test/simple/test-cluster-net-listen.js → test/io/test-cluster-net-listen.js b/test/simple/test-cluster-net-listen.js → test/io/test-cluster-net-listen.js
diff --git a/test/simple/test-cluster-net-send.js → test/io/test-cluster-net-send.js b/test/simple/test-cluster-net-send.js → test/io/test-cluster-net-send.js
diff --git a/test/simple/test-cluster-rr-domain-listen.js → test/io/test-cluster-rr-domain-listen.js b/test/simple/test-cluster-rr-domain-listen.js → test/io/test-cluster-rr-domain-listen.js
diff --git a/test/simple/test-cluster-send-deadlock.js → test/io/test-cluster-send-deadlock.js b/test/simple/test-cluster-send-deadlock.js → test/io/test-cluster-send-deadlock.js
diff --git a/.../simple/test-cluster-send-handle-twice.js → test/io/test-cluster-send-handle-twice.js b/.../simple/test-cluster-send-handle-twice.js → test/io/test-cluster-send-handle-twice.js
diff --git a/.../simple/test-cluster-setup-master-argv.js → test/io/test-cluster-setup-master-argv.js b/.../simple/test-cluster-setup-master-argv.js → test/io/test-cluster-setup-master-argv.js
diff --git a/...e/test-cluster-setup-master-cumulative.js → ...o/test-cluster-setup-master-cumulative.js b/...e/test-cluster-setup-master-cumulative.js → ...o/test-cluster-setup-master-cumulative.js
diff --git a/.../simple/test-cluster-setup-master-emit.js → test/io/test-cluster-setup-master-emit.js b/.../simple/test-cluster-setup-master-emit.js → test/io/test-cluster-setup-master-emit.js
diff --git a/...ple/test-cluster-setup-master-multiple.js → .../io/test-cluster-setup-master-multiple.js b/...ple/test-cluster-setup-master-multiple.js → .../io/test-cluster-setup-master-multiple.js
diff --git a/test/simple/test-cluster-setup-master.js → test/io/test-cluster-setup-master.js b/test/simple/test-cluster-setup-master.js → test/io/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 → test/io/test-cluster-uncaught-exception.js b/...simple/test-cluster-uncaught-exception.js → test/io/test-cluster-uncaught-exception.js
diff --git a/...simple/test-cluster-worker-constructor.js → test/io/test-cluster-worker-constructor.js b/...simple/test-cluster-worker-constructor.js → test/io/test-cluster-worker-constructor.js
diff --git a/test/simple/test-cluster-worker-death.js → test/io/test-cluster-worker-death.js b/test/simple/test-cluster-worker-death.js → test/io/test-cluster-worker-death.js
diff --git a/test/simple/test-cluster-worker-destroy.js → test/io/test-cluster-worker-destroy.js b/test/simple/test-cluster-worker-destroy.js → test/io/test-cluster-worker-destroy.js
diff --git a/.../simple/test-cluster-worker-disconnect.js → test/io/test-cluster-worker-disconnect.js b/.../simple/test-cluster-worker-disconnect.js → test/io/test-cluster-worker-disconnect.js
diff --git a/test/simple/test-cluster-worker-events.js → test/io/test-cluster-worker-events.js b/test/simple/test-cluster-worker-events.js → test/io/test-cluster-worker-events.js
diff --git a/test/simple/test-cluster-worker-exit.js → test/io/test-cluster-worker-exit.js b/test/simple/test-cluster-worker-exit.js → test/io/test-cluster-worker-exit.js
diff --git a/...simple/test-cluster-worker-forced-exit.js → test/io/test-cluster-worker-forced-exit.js b/...simple/test-cluster-worker-forced-exit.js → test/io/test-cluster-worker-forced-exit.js
diff --git a/test/simple/test-cluster-worker-init.js → test/io/test-cluster-worker-init.js b/test/simple/test-cluster-worker-init.js → test/io/test-cluster-worker-init.js
diff --git a/...simple/test-cluster-worker-isconnected.js → test/io/test-cluster-worker-isconnected.js b/...simple/test-cluster-worker-isconnected.js → test/io/test-cluster-worker-isconnected.js
diff --git a/test/simple/test-cluster-worker-isdead.js → test/io/test-cluster-worker-isdead.js b/test/simple/test-cluster-worker-isdead.js → test/io/test-cluster-worker-isdead.js
diff --git a/test/simple/test-cluster-worker-kill.js → test/io/test-cluster-worker-kill.js b/test/simple/test-cluster-worker-kill.js → test/io/test-cluster-worker-kill.js
diff --git a/test/simple/test-cluster-worker-no-exit.js → test/io/test-cluster-worker-no-exit.js b/test/simple/test-cluster-worker-no-exit.js → test/io/test-cluster-worker-no-exit.js
diff --git a/test/simple/test-crypto-binary-default.js → test/io/test-crypto-binary-default.js b/test/simple/test-crypto-binary-default.js → test/io/test-crypto-binary-default.js
diff --git a/test/simple/test-crypto-certificate.js → test/io/test-crypto-certificate.js b/test/simple/test-crypto-certificate.js → test/io/test-crypto-certificate.js
diff --git a/test/simple/test-crypto-verify-failure.js → test/io/test-crypto-verify-failure.js b/test/simple/test-crypto-verify-failure.js → test/io/test-crypto-verify-failure.js
diff --git a/test/simple/test-crypto.js → test/io/test-crypto.js b/test/simple/test-crypto.js → test/io/test-crypto.js
diff --git a/test/simple/test-debug-args.js → test/io/test-debug-args.js b/test/simple/test-debug-args.js → test/io/test-debug-args.js
diff --git a/test/simple/test-debug-cluster.js → test/io/test-debug-cluster.js b/test/simple/test-debug-cluster.js → test/io/test-debug-cluster.js
diff --git a/test/simple/test-debug-port-cluster.js → test/io/test-debug-port-cluster.js b/test/simple/test-debug-port-cluster.js → test/io/test-debug-port-cluster.js
diff --git a/test/simple/test-debug-port-from-cmdline.js → test/io/test-debug-port-from-cmdline.js b/test/simple/test-debug-port-from-cmdline.js → test/io/test-debug-port-from-cmdline.js
diff --git a/test/simple/test-debug-signal-cluster.js → test/io/test-debug-signal-cluster.js b/test/simple/test-debug-signal-cluster.js → test/io/test-debug-signal-cluster.js
diff --git a/test/simple/test-deprecation-flags.js → test/io/test-deprecation-flags.js b/test/simple/test-deprecation-flags.js → test/io/test-deprecation-flags.js
diff --git a/test/simple/test-dgram-address.js → test/io/test-dgram-address.js b/test/simple/test-dgram-address.js → test/io/test-dgram-address.js
diff --git a/...simple/test-dgram-bind-default-address.js → test/io/test-dgram-bind-default-address.js b/...simple/test-dgram-bind-default-address.js → test/io/test-dgram-bind-default-address.js
diff --git a/test/simple/test-dgram-bind-shared-ports.js → test/io/test-dgram-bind-shared-ports.js b/test/simple/test-dgram-bind-shared-ports.js → test/io/test-dgram-bind-shared-ports.js
diff --git a/test/simple/test-dgram-bind.js → test/io/test-dgram-bind.js b/test/simple/test-dgram-bind.js → test/io/test-dgram-bind.js
diff --git a/...ple/test-dgram-broadcast-multi-process.js → .../io/test-dgram-broadcast-multi-process.js b/...ple/test-dgram-broadcast-multi-process.js → .../io/test-dgram-broadcast-multi-process.js
diff --git a/test/simple/test-dgram-bytes-length.js → test/io/test-dgram-bytes-length.js b/test/simple/test-dgram-bytes-length.js → test/io/test-dgram-bytes-length.js
diff --git a/test/simple/test-dgram-close.js → test/io/test-dgram-close.js b/test/simple/test-dgram-close.js → test/io/test-dgram-close.js
diff --git a/test/simple/test-dgram-empty-packet.js → test/io/test-dgram-empty-packet.js b/test/simple/test-dgram-empty-packet.js → test/io/test-dgram-empty-packet.js
diff --git a/test/simple/test-dgram-implicit-bind.js → test/io/test-dgram-implicit-bind.js b/test/simple/test-dgram-implicit-bind.js → test/io/test-dgram-implicit-bind.js
diff --git a/test/simple/test-dgram-listen-after-bind.js → test/io/test-dgram-listen-after-bind.js b/test/simple/test-dgram-listen-after-bind.js → test/io/test-dgram-listen-after-bind.js
diff --git a/test/simple/test-dgram-msgsize.js → test/io/test-dgram-msgsize.js b/test/simple/test-dgram-msgsize.js → test/io/test-dgram-msgsize.js
diff --git a/test/simple/test-dgram-multicast-setTTL.js → test/io/test-dgram-multicast-setTTL.js b/test/simple/test-dgram-multicast-setTTL.js → test/io/test-dgram-multicast-setTTL.js
diff --git a/test/simple/test-dgram-oob-buffer.js → test/io/test-dgram-oob-buffer.js b/test/simple/test-dgram-oob-buffer.js → test/io/test-dgram-oob-buffer.js
diff --git a/test/simple/test-dgram-pingpong.js → test/io/test-dgram-pingpong.js b/test/simple/test-dgram-pingpong.js → test/io/test-dgram-pingpong.js
diff --git a/test/simple/test-dgram-ref.js → test/io/test-dgram-ref.js b/test/simple/test-dgram-ref.js → test/io/test-dgram-ref.js
diff --git a/test/simple/test-dgram-regress-4496.js → test/io/test-dgram-regress-4496.js b/test/simple/test-dgram-regress-4496.js → test/io/test-dgram-regress-4496.js
diff --git a/test/simple/test-dgram-send-bad-arguments.js → test/io/test-dgram-send-bad-arguments.js b/test/simple/test-dgram-send-bad-arguments.js → test/io/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 → test/io/test-dgram-send-empty-buffer.js b/test/simple/test-dgram-send-empty-buffer.js → test/io/test-dgram-send-empty-buffer.js
diff --git a/test/simple/test-dgram-udp4.js → test/io/test-dgram-udp4.js b/test/simple/test-dgram-udp4.js → test/io/test-dgram-udp4.js
diff --git a/test/simple/test-dgram-unref.js → test/io/test-dgram-unref.js b/test/simple/test-dgram-unref.js → test/io/test-dgram-unref.js
diff --git a/test/simple/test-dns-cares-domains.js → test/io/test-dns-cares-domains.js b/test/simple/test-dns-cares-domains.js → test/io/test-dns-cares-domains.js
diff --git a/test/simple/test-dns-lookup-cb-error.js → test/io/test-dns-lookup-cb-error.js b/test/simple/test-dns-lookup-cb-error.js → test/io/test-dns-lookup-cb-error.js
diff --git a/test/simple/test-dns-regress-6244.js → test/io/test-dns-regress-6244.js b/test/simple/test-dns-regress-6244.js → test/io/test-dns-regress-6244.js
diff --git a/test/simple/test-dns-regress-7070.js → test/io/test-dns-regress-7070.js b/test/simple/test-dns-regress-7070.js → test/io/test-dns-regress-7070.js
diff --git a/test/simple/test-dns.js → test/io/test-dns.js b/test/simple/test-dns.js → test/io/test-dns.js
diff --git a/test/simple/test-domain-http-server.js → test/io/test-domain-http-server.js b/test/simple/test-domain-http-server.js → test/io/test-domain-http-server.js
diff --git a/test/simple/test-domain-implicit-fs.js → test/io/test-domain-implicit-fs.js b/test/simple/test-domain-implicit-fs.js → test/io/test-domain-implicit-fs.js
diff --git a/test/simple/test-domain-multi.js → test/io/test-domain-multi.js b/test/simple/test-domain-multi.js → test/io/test-domain-multi.js
diff --git a/test/simple/test-domain-nested-throw.js → test/io/test-domain-nested-throw.js b/test/simple/test-domain-nested-throw.js → test/io/test-domain-nested-throw.js
diff --git a/test/simple/test-domain.js → test/io/test-domain.js b/test/simple/test-domain.js → test/io/test-domain.js
diff --git a/test/simple/test-error-reporting.js → test/io/test-error-reporting.js b/test/simple/test-error-reporting.js → test/io/test-error-reporting.js
diff --git a/test/simple/test-eval-require.js → test/io/test-eval-require.js b/test/simple/test-eval-require.js → test/io/test-eval-require.js
diff --git a/test/simple/test-eval.js → test/io/test-eval.js b/test/simple/test-eval.js → test/io/test-eval.js
diff --git a/test/simple/test-exec-max-buffer.js → test/io/test-exec-max-buffer.js b/test/simple/test-exec-max-buffer.js → test/io/test-exec-max-buffer.js
diff --git a/test/simple/test-file-read-noexist.js → test/io/test-file-read-noexist.js b/test/simple/test-file-read-noexist.js → test/io/test-file-read-noexist.js
diff --git a/test/simple/test-file-write-stream.js → test/io/test-file-write-stream.js b/test/simple/test-file-write-stream.js → test/io/test-file-write-stream.js
diff --git a/test/simple/test-file-write-stream2.js → test/io/test-file-write-stream2.js b/test/simple/test-file-write-stream2.js → test/io/test-file-write-stream2.js
diff --git a/test/simple/test-file-write-stream3.js → test/io/test-file-write-stream3.js b/test/simple/test-file-write-stream3.js → test/io/test-file-write-stream3.js
diff --git a/test/simple/test-force-repl.js → test/io/test-force-repl.js b/test/simple/test-force-repl.js → test/io/test-force-repl.js
diff --git a/test/simple/test-fs-access.js → test/io/test-fs-access.js b/test/simple/test-fs-access.js → test/io/test-fs-access.js
diff --git a/test/simple/test-fs-append-file-sync.js → test/io/test-fs-append-file-sync.js b/test/simple/test-fs-append-file-sync.js → test/io/test-fs-append-file-sync.js
diff --git a/test/simple/test-fs-append-file.js → test/io/test-fs-append-file.js b/test/simple/test-fs-append-file.js → test/io/test-fs-append-file.js
diff --git a/test/simple/test-fs-chmod.js → test/io/test-fs-chmod.js b/test/simple/test-fs-chmod.js → test/io/test-fs-chmod.js
diff --git a/test/simple/test-fs-empty-readStream.js → test/io/test-fs-empty-readStream.js b/test/simple/test-fs-empty-readStream.js → test/io/test-fs-empty-readStream.js
diff --git a/test/simple/test-fs-error-messages.js → test/io/test-fs-error-messages.js b/test/simple/test-fs-error-messages.js → test/io/test-fs-error-messages.js
diff --git a/test/simple/test-fs-exists.js → test/io/test-fs-exists.js b/test/simple/test-fs-exists.js → test/io/test-fs-exists.js
diff --git a/test/simple/test-fs-fsync.js → test/io/test-fs-fsync.js b/test/simple/test-fs-fsync.js → test/io/test-fs-fsync.js
diff --git a/test/simple/test-fs-long-path.js → test/io/test-fs-long-path.js b/test/simple/test-fs-long-path.js → test/io/test-fs-long-path.js
diff --git a/test/simple/test-fs-mkdir.js → test/io/test-fs-mkdir.js b/test/simple/test-fs-mkdir.js → test/io/test-fs-mkdir.js
diff --git a/...ple/test-fs-non-number-arguments-throw.js → .../io/test-fs-non-number-arguments-throw.js b/...ple/test-fs-non-number-arguments-throw.js → .../io/test-fs-non-number-arguments-throw.js
diff --git a/test/simple/test-fs-null-bytes.js → test/io/test-fs-null-bytes.js b/test/simple/test-fs-null-bytes.js → test/io/test-fs-null-bytes.js
diff --git a/test/simple/test-fs-open-flags.js → test/io/test-fs-open-flags.js b/test/simple/test-fs-open-flags.js → test/io/test-fs-open-flags.js
diff --git a/test/simple/test-fs-open.js → test/io/test-fs-open.js b/test/simple/test-fs-open.js → test/io/test-fs-open.js
diff --git a/test/simple/test-fs-read-buffer.js → test/io/test-fs-read-buffer.js b/test/simple/test-fs-read-buffer.js → test/io/test-fs-read-buffer.js
diff --git a/...simple/test-fs-read-file-sync-hostname.js → test/io/test-fs-read-file-sync-hostname.js b/...simple/test-fs-read-file-sync-hostname.js → test/io/test-fs-read-file-sync-hostname.js
diff --git a/test/simple/test-fs-read-file-sync.js → test/io/test-fs-read-file-sync.js b/test/simple/test-fs-read-file-sync.js → test/io/test-fs-read-file-sync.js
diff --git a/test/simple/test-fs-read-stream-err.js → test/io/test-fs-read-stream-err.js b/test/simple/test-fs-read-stream-err.js → test/io/test-fs-read-stream-err.js
diff --git a/test/simple/test-fs-read-stream-fd.js → test/io/test-fs-read-stream-fd.js b/test/simple/test-fs-read-stream-fd.js → test/io/test-fs-read-stream-fd.js
diff --git a/test/simple/test-fs-read-stream-resume.js → test/io/test-fs-read-stream-resume.js b/test/simple/test-fs-read-stream-resume.js → test/io/test-fs-read-stream-resume.js
diff --git a/test/simple/test-fs-read-stream.js → test/io/test-fs-read-stream.js b/test/simple/test-fs-read-stream.js → test/io/test-fs-read-stream.js
diff --git a/test/simple/test-fs-read.js → test/io/test-fs-read.js b/test/simple/test-fs-read.js → test/io/test-fs-read.js
diff --git a/test/simple/test-fs-readfile-empty.js → test/io/test-fs-readfile-empty.js b/test/simple/test-fs-readfile-empty.js → test/io/test-fs-readfile-empty.js
diff --git a/test/simple/test-fs-readfile-error.js → test/io/test-fs-readfile-error.js b/test/simple/test-fs-readfile-error.js → test/io/test-fs-readfile-error.js
diff --git a/test/simple/test-fs-readfile-pipe.js → test/io/test-fs-readfile-pipe.js b/test/simple/test-fs-readfile-pipe.js → test/io/test-fs-readfile-pipe.js
diff --git a/test/simple/test-fs-readfile-unlink.js → test/io/test-fs-readfile-unlink.js b/test/simple/test-fs-readfile-unlink.js → test/io/test-fs-readfile-unlink.js
diff --git a/...simple/test-fs-readfile-zero-byte-liar.js → test/io/test-fs-readfile-zero-byte-liar.js b/...simple/test-fs-readfile-zero-byte-liar.js → test/io/test-fs-readfile-zero-byte-liar.js
diff --git a/test/simple/test-fs-realpath.js → test/io/test-fs-realpath.js b/test/simple/test-fs-realpath.js → test/io/test-fs-realpath.js
diff --git a/test/simple/test-fs-sir-writes-alot.js → test/io/test-fs-sir-writes-alot.js b/test/simple/test-fs-sir-writes-alot.js → test/io/test-fs-sir-writes-alot.js
diff --git a/test/simple/test-fs-stat.js → test/io/test-fs-stat.js b/test/simple/test-fs-stat.js → test/io/test-fs-stat.js
diff --git a/test/simple/test-fs-stream-double-close.js → test/io/test-fs-stream-double-close.js b/test/simple/test-fs-stream-double-close.js → test/io/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 → test/io/test-fs-symlink-dir-junction.js b/test/simple/test-fs-symlink-dir-junction.js → test/io/test-fs-symlink-dir-junction.js
diff --git a/test/simple/test-fs-symlink.js → test/io/test-fs-symlink.js b/test/simple/test-fs-symlink.js → test/io/test-fs-symlink.js
diff --git a/test/simple/test-fs-sync-fd-leak.js → test/io/test-fs-sync-fd-leak.js b/test/simple/test-fs-sync-fd-leak.js → test/io/test-fs-sync-fd-leak.js
diff --git a/test/simple/test-fs-truncate-GH-6233.js → test/io/test-fs-truncate-GH-6233.js b/test/simple/test-fs-truncate-GH-6233.js → test/io/test-fs-truncate-GH-6233.js
diff --git a/test/simple/test-fs-truncate.js → test/io/test-fs-truncate.js b/test/simple/test-fs-truncate.js → test/io/test-fs-truncate.js
diff --git a/test/simple/test-fs-utimes.js → test/io/test-fs-utimes.js b/test/simple/test-fs-utimes.js → test/io/test-fs-utimes.js
diff --git a/test/simple/test-fs-watch-recursive.js → test/io/test-fs-watch-recursive.js b/test/simple/test-fs-watch-recursive.js → test/io/test-fs-watch-recursive.js
diff --git a/test/simple/test-fs-watch.js → test/io/test-fs-watch.js b/test/simple/test-fs-watch.js → test/io/test-fs-watch.js
diff --git a/test/simple/test-fs-write-buffer.js → test/io/test-fs-write-buffer.js b/test/simple/test-fs-write-buffer.js → test/io/test-fs-write-buffer.js
diff --git a/test/simple/test-fs-write-file-buffer.js → test/io/test-fs-write-file-buffer.js b/test/simple/test-fs-write-file-buffer.js → test/io/test-fs-write-file-buffer.js
diff --git a/test/simple/test-fs-write-file-sync.js → test/io/test-fs-write-file-sync.js b/test/simple/test-fs-write-file-sync.js → test/io/test-fs-write-file-sync.js
diff --git a/test/simple/test-fs-write-file.js → test/io/test-fs-write-file.js b/test/simple/test-fs-write-file.js → test/io/test-fs-write-file.js
diff --git a/...imple/test-fs-write-stream-change-open.js → test/io/test-fs-write-stream-change-open.js b/...imple/test-fs-write-stream-change-open.js → test/io/test-fs-write-stream-change-open.js
diff --git a/test/simple/test-fs-write-stream-end.js → test/io/test-fs-write-stream-end.js b/test/simple/test-fs-write-stream-end.js → test/io/test-fs-write-stream-end.js
diff --git a/test/simple/test-fs-write-stream-err.js → test/io/test-fs-write-stream-err.js b/test/simple/test-fs-write-stream-err.js → test/io/test-fs-write-stream-err.js
diff --git a/test/simple/test-fs-write-stream.js → test/io/test-fs-write-stream.js b/test/simple/test-fs-write-stream.js → test/io/test-fs-write-stream.js
diff --git a/test/simple/test-fs-write-sync.js → test/io/test-fs-write-sync.js b/test/simple/test-fs-write-sync.js → test/io/test-fs-write-sync.js
diff --git a/test/simple/test-fs-write.js → test/io/test-fs-write.js b/test/simple/test-fs-write.js → test/io/test-fs-write.js
diff --git a/test/simple/test-http-1.0-keep-alive.js → test/io/test-http-1.0-keep-alive.js b/test/simple/test-http-1.0-keep-alive.js → test/io/test-http-1.0-keep-alive.js
diff --git a/test/simple/test-http-1.0.js → test/io/test-http-1.0.js b/test/simple/test-http-1.0.js → test/io/test-http-1.0.js
diff --git a/test/simple/test-http-304.js → test/io/test-http-304.js b/test/simple/test-http-304.js → test/io/test-http-304.js
diff --git a/test/simple/test-http-abort-before-end.js → test/io/test-http-abort-before-end.js b/test/simple/test-http-abort-before-end.js → test/io/test-http-abort-before-end.js
diff --git a/test/simple/test-http-abort-client.js → test/io/test-http-abort-client.js b/test/simple/test-http-abort-client.js → test/io/test-http-abort-client.js
diff --git a/test/simple/test-http-abort-queued.js → test/io/test-http-abort-queued.js b/test/simple/test-http-abort-queued.js → test/io/test-http-abort-queued.js
diff --git a/test/simple/test-http-after-connect.js → test/io/test-http-after-connect.js b/test/simple/test-http-after-connect.js → test/io/test-http-after-connect.js
diff --git a/...imple/test-http-agent-destroyed-socket.js → test/io/test-http-agent-destroyed-socket.js b/...imple/test-http-agent-destroyed-socket.js → test/io/test-http-agent-destroyed-socket.js
diff --git a/test/simple/test-http-agent-false.js → test/io/test-http-agent-false.js b/test/simple/test-http-agent-false.js → test/io/test-http-agent-false.js
diff --git a/test/simple/test-http-agent-keepalive.js → test/io/test-http-agent-keepalive.js b/test/simple/test-http-agent-keepalive.js → test/io/test-http-agent-keepalive.js
diff --git a/test/simple/test-http-agent-no-protocol.js → test/io/test-http-agent-no-protocol.js b/test/simple/test-http-agent-no-protocol.js → test/io/test-http-agent-no-protocol.js
diff --git a/test/simple/test-http-agent-null.js → test/io/test-http-agent-null.js b/test/simple/test-http-agent-null.js → test/io/test-http-agent-null.js
diff --git a/test/simple/test-http-agent.js → test/io/test-http-agent.js b/test/simple/test-http-agent.js → test/io/test-http-agent.js
diff --git a/...mple/test-http-allow-req-after-204-res.js → test/io/test-http-allow-req-after-204-res.js b/...mple/test-http-allow-req-after-204-res.js → test/io/test-http-allow-req-after-204-res.js
diff --git a/test/simple/test-http-bind-twice.js → test/io/test-http-bind-twice.js b/test/simple/test-http-bind-twice.js → test/io/test-http-bind-twice.js
diff --git a/test/simple/test-http-blank-header.js → test/io/test-http-blank-header.js b/test/simple/test-http-blank-header.js → test/io/test-http-blank-header.js
diff --git a/test/simple/test-http-buffer-sanity.js → test/io/test-http-buffer-sanity.js b/test/simple/test-http-buffer-sanity.js → test/io/test-http-buffer-sanity.js
diff --git a/test/simple/test-http-byteswritten.js → test/io/test-http-byteswritten.js b/test/simple/test-http-byteswritten.js → test/io/test-http-byteswritten.js
diff --git a/test/simple/test-http-chunked-304.js → test/io/test-http-chunked-304.js b/test/simple/test-http-chunked-304.js → test/io/test-http-chunked-304.js
diff --git a/test/simple/test-http-chunked.js → test/io/test-http-chunked.js b/test/simple/test-http-chunked.js → test/io/test-http-chunked.js
diff --git a/test/simple/test-http-client-abort.js → test/io/test-http-client-abort.js b/test/simple/test-http-client-abort.js → test/io/test-http-client-abort.js
diff --git a/test/simple/test-http-client-abort2.js → test/io/test-http-client-abort2.js b/test/simple/test-http-client-abort2.js → test/io/test-http-client-abort2.js
diff --git a/test/simple/test-http-client-agent.js → test/io/test-http-client-agent.js b/test/simple/test-http-client-agent.js → test/io/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/io/test-http-client-encoding.js b/test/simple/test-http-client-encoding.js → test/io/test-http-client-encoding.js
diff --git a/test/simple/test-http-client-get-url.js → test/io/test-http-client-get-url.js b/test/simple/test-http-client-get-url.js → test/io/test-http-client-get-url.js
diff --git a/test/simple/test-http-client-parse-error.js → test/io/test-http-client-parse-error.js b/test/simple/test-http-client-parse-error.js → test/io/test-http-client-parse-error.js
diff --git a/test/simple/test-http-client-pipe-end.js → test/io/test-http-client-pipe-end.js b/test/simple/test-http-client-pipe-end.js → test/io/test-http-client-pipe-end.js
diff --git a/test/simple/test-http-client-race-2.js → test/io/test-http-client-race-2.js b/test/simple/test-http-client-race-2.js → test/io/test-http-client-race-2.js
diff --git a/test/simple/test-http-client-race.js → test/io/test-http-client-race.js b/test/simple/test-http-client-race.js → test/io/test-http-client-race.js
diff --git a/test/simple/test-http-client-readable.js → test/io/test-http-client-readable.js b/test/simple/test-http-client-readable.js → test/io/test-http-client-readable.js
diff --git a/...imple/test-http-client-response-domain.js → test/io/test-http-client-response-domain.js b/...imple/test-http-client-response-domain.js → test/io/test-http-client-response-domain.js
diff --git a/.../simple/test-http-client-timeout-agent.js → test/io/test-http-client-timeout-agent.js b/.../simple/test-http-client-timeout-agent.js → test/io/test-http-client-timeout-agent.js
diff --git a/.../simple/test-http-client-timeout-event.js → test/io/test-http-client-timeout-event.js b/.../simple/test-http-client-timeout-event.js → test/io/test-http-client-timeout-event.js
diff --git a/...ple/test-http-client-timeout-with-data.js → .../io/test-http-client-timeout-with-data.js b/...ple/test-http-client-timeout-with-data.js → .../io/test-http-client-timeout-with-data.js
diff --git a/test/simple/test-http-client-timeout.js → test/io/test-http-client-timeout.js b/test/simple/test-http-client-timeout.js → test/io/test-http-client-timeout.js
diff --git a/...simple/test-http-client-unescaped-path.js → test/io/test-http-client-unescaped-path.js b/...simple/test-http-client-unescaped-path.js → test/io/test-http-client-unescaped-path.js
diff --git a/test/simple/test-http-client-upload-buf.js → test/io/test-http-client-upload-buf.js b/test/simple/test-http-client-upload-buf.js → test/io/test-http-client-upload-buf.js
diff --git a/test/simple/test-http-client-upload.js → test/io/test-http-client-upload.js b/test/simple/test-http-client-upload.js → test/io/test-http-client-upload.js
diff --git a/test/simple/test-http-conn-reset.js → test/io/test-http-conn-reset.js b/test/simple/test-http-conn-reset.js → test/io/test-http-conn-reset.js
diff --git a/test/simple/test-http-connect.js → test/io/test-http-connect.js b/test/simple/test-http-connect.js → test/io/test-http-connect.js
diff --git a/test/simple/test-http-contentLength0.js → test/io/test-http-contentLength0.js b/test/simple/test-http-contentLength0.js → test/io/test-http-contentLength0.js
diff --git a/test/simple/test-http-createConnection.js → test/io/test-http-createConnection.js b/test/simple/test-http-createConnection.js → test/io/test-http-createConnection.js
diff --git a/test/simple/test-http-curl-chunk-problem.js → test/io/test-http-curl-chunk-problem.js b/test/simple/test-http-curl-chunk-problem.js → test/io/test-http-curl-chunk-problem.js
diff --git a/test/simple/test-http-date-header.js → test/io/test-http-date-header.js b/test/simple/test-http-date-header.js → test/io/test-http-date-header.js
diff --git a/test/simple/test-http-default-encoding.js → test/io/test-http-default-encoding.js b/test/simple/test-http-default-encoding.js → test/io/test-http-default-encoding.js
diff --git a/test/simple/test-http-default-port.js → test/io/test-http-default-port.js b/test/simple/test-http-default-port.js → test/io/test-http-default-port.js
diff --git a/...mple/test-http-destroyed-socket-write2.js → test/io/test-http-destroyed-socket-write2.js b/...mple/test-http-destroyed-socket-write2.js → test/io/test-http-destroyed-socket-write2.js
diff --git a/test/simple/test-http-dns-error.js → test/io/test-http-dns-error.js b/test/simple/test-http-dns-error.js → test/io/test-http-dns-error.js
diff --git a/...le/test-http-end-throw-socket-handling.js → ...io/test-http-end-throw-socket-handling.js b/...le/test-http-end-throw-socket-handling.js → ...io/test-http-end-throw-socket-handling.js
diff --git a/test/simple/test-http-eof-on-connect.js → test/io/test-http-eof-on-connect.js b/test/simple/test-http-eof-on-connect.js → test/io/test-http-eof-on-connect.js
diff --git a/test/simple/test-http-exceptions.js → test/io/test-http-exceptions.js b/test/simple/test-http-exceptions.js → test/io/test-http-exceptions.js
diff --git a/test/simple/test-http-exit-delay.js → test/io/test-http-exit-delay.js b/test/simple/test-http-exit-delay.js → test/io/test-http-exit-delay.js
diff --git a/test/simple/test-http-expect-continue.js → test/io/test-http-expect-continue.js b/test/simple/test-http-expect-continue.js → test/io/test-http-expect-continue.js
diff --git a/test/simple/test-http-extra-response.js → test/io/test-http-extra-response.js b/test/simple/test-http-extra-response.js → test/io/test-http-extra-response.js
diff --git a/test/simple/test-http-flush.js → test/io/test-http-flush.js b/test/simple/test-http-flush.js → test/io/test-http-flush.js
diff --git a/test/simple/test-http-full-response.js → test/io/test-http-full-response.js b/test/simple/test-http-full-response.js → test/io/test-http-full-response.js
diff --git a/.../simple/test-http-get-pipeline-problem.js → test/io/test-http-get-pipeline-problem.js b/.../simple/test-http-get-pipeline-problem.js → test/io/test-http-get-pipeline-problem.js
diff --git a/test/simple/test-http-head-request.js → test/io/test-http-head-request.js b/test/simple/test-http-head-request.js → test/io/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 → ...io/test-http-head-response-has-no-body.js b/...le/test-http-head-response-has-no-body.js → ...io/test-http-head-response-has-no-body.js
diff --git a/test/simple/test-http-header-read.js → test/io/test-http-header-read.js b/test/simple/test-http-header-read.js → test/io/test-http-header-read.js
diff --git a/...le/test-http-header-response-splitting.js → ...io/test-http-header-response-splitting.js b/...le/test-http-header-response-splitting.js → ...io/test-http-header-response-splitting.js
diff --git a/test/simple/test-http-hex-write.js → test/io/test-http-hex-write.js b/test/simple/test-http-hex-write.js → test/io/test-http-hex-write.js
diff --git a/test/simple/test-http-host-headers.js → test/io/test-http-host-headers.js b/test/simple/test-http-host-headers.js → test/io/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 → ...o/test-http-keep-alive-close-on-header.js b/...e/test-http-keep-alive-close-on-header.js → ...o/test-http-keep-alive-close-on-header.js
diff --git a/test/simple/test-http-keep-alive.js → test/io/test-http-keep-alive.js b/test/simple/test-http-keep-alive.js → test/io/test-http-keep-alive.js
diff --git a/test/simple/test-http-keepalive-client.js → test/io/test-http-keepalive-client.js b/test/simple/test-http-keepalive-client.js → test/io/test-http-keepalive-client.js
diff --git a/.../simple/test-http-keepalive-maxsockets.js → test/io/test-http-keepalive-maxsockets.js b/.../simple/test-http-keepalive-maxsockets.js → test/io/test-http-keepalive-maxsockets.js
diff --git a/test/simple/test-http-keepalive-request.js → test/io/test-http-keepalive-request.js b/test/simple/test-http-keepalive-request.js → test/io/test-http-keepalive-request.js
diff --git a/test/simple/test-http-legacy.js → test/io/test-http-legacy.js b/test/simple/test-http-legacy.js → test/io/test-http-legacy.js
diff --git a/...mple/test-http-localaddress-bind-error.js → test/io/test-http-localaddress-bind-error.js b/...mple/test-http-localaddress-bind-error.js → test/io/test-http-localaddress-bind-error.js
diff --git a/test/simple/test-http-localaddress.js → test/io/test-http-localaddress.js b/test/simple/test-http-localaddress.js → test/io/test-http-localaddress.js
diff --git a/test/simple/test-http-malformed-request.js → test/io/test-http-malformed-request.js b/test/simple/test-http-malformed-request.js → test/io/test-http-malformed-request.js
diff --git a/.../simple/test-http-many-ended-pipelines.js → test/io/test-http-many-ended-pipelines.js b/.../simple/test-http-many-ended-pipelines.js → test/io/test-http-many-ended-pipelines.js
diff --git a/test/simple/test-http-max-headers-count.js → test/io/test-http-max-headers-count.js b/test/simple/test-http-max-headers-count.js → test/io/test-http-max-headers-count.js
diff --git a/test/simple/test-http-methods.js → test/io/test-http-methods.js b/test/simple/test-http-methods.js → test/io/test-http-methods.js
diff --git a/test/simple/test-http-multi-line-headers.js → test/io/test-http-multi-line-headers.js b/test/simple/test-http-multi-line-headers.js → test/io/test-http-multi-line-headers.js
diff --git a/test/simple/test-http-mutable-headers.js → test/io/test-http-mutable-headers.js b/test/simple/test-http-mutable-headers.js → test/io/test-http-mutable-headers.js
diff --git a/test/simple/test-http-no-content-length.js → test/io/test-http-no-content-length.js b/test/simple/test-http-no-content-length.js → test/io/test-http-no-content-length.js
diff --git a/test/simple/test-http-outgoing-finish.js → test/io/test-http-outgoing-finish.js b/test/simple/test-http-outgoing-finish.js → test/io/test-http-outgoing-finish.js
diff --git a/test/simple/test-http-parser-free.js → test/io/test-http-parser-free.js b/test/simple/test-http-parser-free.js → test/io/test-http-parser-free.js
diff --git a/.../simple/test-http-pause-resume-one-end.js → test/io/test-http-pause-resume-one-end.js b/.../simple/test-http-pause-resume-one-end.js → test/io/test-http-pause-resume-one-end.js
diff --git a/test/simple/test-http-pause.js → test/io/test-http-pause.js b/test/simple/test-http-pause.js → test/io/test-http-pause.js
diff --git a/test/simple/test-http-pipe-fs.js → test/io/test-http-pipe-fs.js b/test/simple/test-http-pipe-fs.js → test/io/test-http-pipe-fs.js
diff --git a/test/simple/test-http-pipeline-flood.js → test/io/test-http-pipeline-flood.js b/test/simple/test-http-pipeline-flood.js → test/io/test-http-pipeline-flood.js
diff --git a/test/simple/test-http-proxy.js → test/io/test-http-proxy.js b/test/simple/test-http-proxy.js → test/io/test-http-proxy.js
diff --git a/test/simple/test-http-raw-headers.js → test/io/test-http-raw-headers.js b/test/simple/test-http-raw-headers.js → test/io/test-http-raw-headers.js
diff --git a/.../test-http-remove-header-stays-removed.js → .../test-http-remove-header-stays-removed.js b/.../test-http-remove-header-stays-removed.js → .../test-http-remove-header-stays-removed.js
diff --git a/test/simple/test-http-request-end-twice.js → test/io/test-http-request-end-twice.js b/test/simple/test-http-request-end-twice.js → test/io/test-http-request-end-twice.js
diff --git a/test/simple/test-http-request-end.js → test/io/test-http-request-end.js b/test/simple/test-http-request-end.js → test/io/test-http-request-end.js
diff --git a/test/simple/test-http-request-methods.js → test/io/test-http-request-methods.js b/test/simple/test-http-request-methods.js → test/io/test-http-request-methods.js
diff --git a/test/simple/test-http-res-write-after-end.js → test/io/test-http-res-write-after-end.js b/test/simple/test-http-res-write-after-end.js → test/io/test-http-res-write-after-end.js
diff --git a/...est-http-res-write-end-dont-take-array.js → ...est-http-res-write-end-dont-take-array.js b/...est-http-res-write-end-dont-take-array.js → ...est-http-res-write-end-dont-take-array.js
diff --git a/test/simple/test-http-response-close.js → test/io/test-http-response-close.js b/test/simple/test-http-response-close.js → test/io/test-http-response-close.js
diff --git a/test/simple/test-http-response-no-headers.js → test/io/test-http-response-no-headers.js b/test/simple/test-http-response-no-headers.js → test/io/test-http-response-no-headers.js
diff --git a/test/simple/test-http-response-readable.js → test/io/test-http-response-readable.js b/test/simple/test-http-response-readable.js → test/io/test-http-response-readable.js
diff --git a/...mple/test-http-response-status-message.js → test/io/test-http-response-status-message.js b/...mple/test-http-response-status-message.js → test/io/test-http-response-status-message.js
diff --git a/test/simple/test-http-server-multiheaders.js → test/io/test-http-server-multiheaders.js b/test/simple/test-http-server-multiheaders.js → test/io/test-http-server-multiheaders.js
diff --git a/.../simple/test-http-server-multiheaders2.js → test/io/test-http-server-multiheaders2.js b/.../simple/test-http-server-multiheaders2.js → test/io/test-http-server-multiheaders2.js
diff --git a/test/simple/test-http-server-stale-close.js → test/io/test-http-server-stale-close.js b/test/simple/test-http-server-stale-close.js → test/io/test-http-server-stale-close.js
diff --git a/test/simple/test-http-server.js → test/io/test-http-server.js b/test/simple/test-http-server.js → test/io/test-http-server.js
diff --git a/test/simple/test-http-set-cookies.js → test/io/test-http-set-cookies.js b/test/simple/test-http-set-cookies.js → test/io/test-http-set-cookies.js
diff --git a/test/simple/test-http-set-timeout-server.js → test/io/test-http-set-timeout-server.js b/test/simple/test-http-set-timeout-server.js → test/io/test-http-set-timeout-server.js
diff --git a/test/simple/test-http-set-timeout.js → test/io/test-http-set-timeout.js b/test/simple/test-http-set-timeout.js → test/io/test-http-set-timeout.js