From 0f9405dd33df48b7d556c1bd3bf7b4a5281bcb2c Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Sat, 9 Apr 2016 18:47:50 +0200 Subject: [PATCH] test: move more tests from sequential to parallel Only `test-stdin-from-file.js` has been modified so that the `stdin.txt` is written in a temp directory instead of the `fixtures` directory. PR-URL: https://github.com/nodejs/node/pull/6187 Reviewed-By: James M Snell --- test/{sequential => parallel}/test-cluster-listening-port.js | 0 test/{sequential => parallel}/test-memory-usage-emfile.js | 0 .../test-net-listen-exclusive-random-ports.js | 0 test/{sequential => parallel}/test-net-server-bind.js | 0 test/{sequential => parallel}/test-pipe-address.js | 0 test/{sequential => parallel}/test-pipe-head.js | 0 test/{sequential => parallel}/test-pipe-stream.js | 1 - test/{sequential => parallel}/test-pipe-unref.js | 0 test/{sequential => parallel}/test-regress-GH-3542.js | 0 test/{sequential => parallel}/test-regress-GH-819.js | 0 test/{sequential => parallel}/test-setproctitle.js | 0 test/{sequential => parallel}/test-sigint-infinite-loop.js | 1 - test/{sequential => parallel}/test-stdin-from-file.js | 4 +++- test/{sequential => parallel}/test-stdout-close-catch.js | 0 test/{sequential => parallel}/test-stdout-stderr-reading.js | 0 .../test-stream2-httpclient-response-end.js | 1 - test/{sequential => parallel}/test-tcp-wrap-connect.js | 0 test/{sequential => parallel}/test-tcp-wrap-listen.js | 0 test/{sequential => parallel}/test-tls-honorcipherorder.js | 0 19 files changed, 3 insertions(+), 4 deletions(-) rename test/{sequential => parallel}/test-cluster-listening-port.js (100%) rename test/{sequential => parallel}/test-memory-usage-emfile.js (100%) rename test/{sequential => parallel}/test-net-listen-exclusive-random-ports.js (100%) rename test/{sequential => parallel}/test-net-server-bind.js (100%) rename test/{sequential => parallel}/test-pipe-address.js (100%) rename test/{sequential => parallel}/test-pipe-head.js (100%) rename test/{sequential => parallel}/test-pipe-stream.js (99%) rename test/{sequential => parallel}/test-pipe-unref.js (100%) rename test/{sequential => parallel}/test-regress-GH-3542.js (100%) rename test/{sequential => parallel}/test-regress-GH-819.js (100%) rename test/{sequential => parallel}/test-setproctitle.js (100%) rename test/{sequential => parallel}/test-sigint-infinite-loop.js (99%) rename test/{sequential => parallel}/test-stdin-from-file.js (95%) rename test/{sequential => parallel}/test-stdout-close-catch.js (100%) rename test/{sequential => parallel}/test-stdout-stderr-reading.js (100%) rename test/{sequential => parallel}/test-stream2-httpclient-response-end.js (99%) rename test/{sequential => parallel}/test-tcp-wrap-connect.js (100%) rename test/{sequential => parallel}/test-tcp-wrap-listen.js (100%) rename test/{sequential => parallel}/test-tls-honorcipherorder.js (100%) diff --git a/test/sequential/test-cluster-listening-port.js b/test/parallel/test-cluster-listening-port.js similarity index 100% rename from test/sequential/test-cluster-listening-port.js rename to test/parallel/test-cluster-listening-port.js diff --git a/test/sequential/test-memory-usage-emfile.js b/test/parallel/test-memory-usage-emfile.js similarity index 100% rename from test/sequential/test-memory-usage-emfile.js rename to test/parallel/test-memory-usage-emfile.js diff --git a/test/sequential/test-net-listen-exclusive-random-ports.js b/test/parallel/test-net-listen-exclusive-random-ports.js similarity index 100% rename from test/sequential/test-net-listen-exclusive-random-ports.js rename to test/parallel/test-net-listen-exclusive-random-ports.js diff --git a/test/sequential/test-net-server-bind.js b/test/parallel/test-net-server-bind.js similarity index 100% rename from test/sequential/test-net-server-bind.js rename to test/parallel/test-net-server-bind.js diff --git a/test/sequential/test-pipe-address.js b/test/parallel/test-pipe-address.js similarity index 100% rename from test/sequential/test-pipe-address.js rename to test/parallel/test-pipe-address.js diff --git a/test/sequential/test-pipe-head.js b/test/parallel/test-pipe-head.js similarity index 100% rename from test/sequential/test-pipe-head.js rename to test/parallel/test-pipe-head.js diff --git a/test/sequential/test-pipe-stream.js b/test/parallel/test-pipe-stream.js similarity index 99% rename from test/sequential/test-pipe-stream.js rename to test/parallel/test-pipe-stream.js index 693066c2fb25d0..6298495087ac06 100644 --- a/test/sequential/test-pipe-stream.js +++ b/test/parallel/test-pipe-stream.js @@ -65,4 +65,3 @@ function test(clazz, cb) { test(net.Stream, function() { test(net.Socket); }); - diff --git a/test/sequential/test-pipe-unref.js b/test/parallel/test-pipe-unref.js similarity index 100% rename from test/sequential/test-pipe-unref.js rename to test/parallel/test-pipe-unref.js diff --git a/test/sequential/test-regress-GH-3542.js b/test/parallel/test-regress-GH-3542.js similarity index 100% rename from test/sequential/test-regress-GH-3542.js rename to test/parallel/test-regress-GH-3542.js diff --git a/test/sequential/test-regress-GH-819.js b/test/parallel/test-regress-GH-819.js similarity index 100% rename from test/sequential/test-regress-GH-819.js rename to test/parallel/test-regress-GH-819.js diff --git a/test/sequential/test-setproctitle.js b/test/parallel/test-setproctitle.js similarity index 100% rename from test/sequential/test-setproctitle.js rename to test/parallel/test-setproctitle.js diff --git a/test/sequential/test-sigint-infinite-loop.js b/test/parallel/test-sigint-infinite-loop.js similarity index 99% rename from test/sequential/test-sigint-infinite-loop.js rename to test/parallel/test-sigint-infinite-loop.js index 1570f9c59dd5d3..a284367e563b26 100644 --- a/test/sequential/test-sigint-infinite-loop.js +++ b/test/parallel/test-sigint-infinite-loop.js @@ -35,4 +35,3 @@ process.on('exit', function() { assert.ok(sentKill); assert.ok(gotChildExit); }); - diff --git a/test/sequential/test-stdin-from-file.js b/test/parallel/test-stdin-from-file.js similarity index 95% rename from test/sequential/test-stdin-from-file.js rename to test/parallel/test-stdin-from-file.js index 07b044769b3791..862405b5d9b71a 100644 --- a/test/sequential/test-stdin-from-file.js +++ b/test/parallel/test-stdin-from-file.js @@ -6,7 +6,7 @@ var childProcess = require('child_process'); var fs = require('fs'); var stdoutScript = join(common.fixturesDir, 'echo-close-check.js'); -var tmpFile = join(common.fixturesDir, 'stdin.txt'); +var tmpFile = join(common.tmpDir, 'stdin.txt'); var cmd = '"' + process.argv[0] + '" "' + stdoutScript + '" < "' + tmpFile + '"'; @@ -24,6 +24,8 @@ var string = 'abc\nümlaut.\nsomething else\n' + '有效的改善了岭南地区落后的政治、##济现状。\n'; +common.refreshTmpDir(); + console.log(cmd + '\n\n'); try { diff --git a/test/sequential/test-stdout-close-catch.js b/test/parallel/test-stdout-close-catch.js similarity index 100% rename from test/sequential/test-stdout-close-catch.js rename to test/parallel/test-stdout-close-catch.js diff --git a/test/sequential/test-stdout-stderr-reading.js b/test/parallel/test-stdout-stderr-reading.js similarity index 100% rename from test/sequential/test-stdout-stderr-reading.js rename to test/parallel/test-stdout-stderr-reading.js diff --git a/test/sequential/test-stream2-httpclient-response-end.js b/test/parallel/test-stream2-httpclient-response-end.js similarity index 99% rename from test/sequential/test-stream2-httpclient-response-end.js rename to test/parallel/test-stream2-httpclient-response-end.js index 15d7fba27f63af..b778af58e2eec8 100644 --- a/test/sequential/test-stream2-httpclient-response-end.js +++ b/test/parallel/test-stream2-httpclient-response-end.js @@ -29,4 +29,3 @@ process.on('exit', function() { assert(readable_event); assert(end_event); }); - diff --git a/test/sequential/test-tcp-wrap-connect.js b/test/parallel/test-tcp-wrap-connect.js similarity index 100% rename from test/sequential/test-tcp-wrap-connect.js rename to test/parallel/test-tcp-wrap-connect.js diff --git a/test/sequential/test-tcp-wrap-listen.js b/test/parallel/test-tcp-wrap-listen.js similarity index 100% rename from test/sequential/test-tcp-wrap-listen.js rename to test/parallel/test-tcp-wrap-listen.js diff --git a/test/sequential/test-tls-honorcipherorder.js b/test/parallel/test-tls-honorcipherorder.js similarity index 100% rename from test/sequential/test-tls-honorcipherorder.js rename to test/parallel/test-tls-honorcipherorder.js