diff options
author | Sakthipriyan Vairamani <thechargingvolcano@gmail.com> | 2016-07-19 02:03:42 +0530 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2016-07-21 16:39:21 -0700 |
commit | 612307564b2f7758ad4436f95b03c05dca1198d7 (patch) | |
tree | aef09dd1b3859f3ceaff727f1a0d971585ee15e0 /test/parallel | |
parent | c21a212bdc3a9e15f37bb6556546b3778503bcf0 (diff) | |
download | android-node-v8-612307564b2f7758ad4436f95b03c05dca1198d7.tar.gz android-node-v8-612307564b2f7758ad4436f95b03c05dca1198d7.tar.bz2 android-node-v8-612307564b2f7758ad4436f95b03c05dca1198d7.zip |
test: make import common as the first line
The `test/common` module has the capability to identify if any variable
is leaked to the global scope and fail the test. So that has to be
imported at the beginning.
PR-URL: https://github.com/nodejs/node/pull/7786
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'test/parallel')
33 files changed, 34 insertions, 40 deletions
diff --git a/test/parallel/test-child-process-disconnect.js b/test/parallel/test-child-process-disconnect.js index ad63cbb78b..4681e04053 100644 --- a/test/parallel/test-child-process-disconnect.js +++ b/test/parallel/test-child-process-disconnect.js @@ -1,6 +1,6 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); var fork = require('child_process').fork; var net = require('net'); diff --git a/test/parallel/test-child-process-flush-stdio.js b/test/parallel/test-child-process-flush-stdio.js index c2cae2069a..a2f0bb9f71 100644 --- a/test/parallel/test-child-process-flush-stdio.js +++ b/test/parallel/test-child-process-flush-stdio.js @@ -1,6 +1,6 @@ 'use strict'; -const cp = require('child_process'); const common = require('../common'); +const cp = require('child_process'); const assert = require('assert'); // Windows' `echo` command is a built-in shell command and not an external diff --git a/test/parallel/test-child-process-fork-close.js b/test/parallel/test-child-process-fork-close.js index 8af22e7dcf..d6e9675ba8 100644 --- a/test/parallel/test-child-process-fork-close.js +++ b/test/parallel/test-child-process-fork-close.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); const common = require('../common'); +const assert = require('assert'); const fork = require('child_process').fork; var cp = fork(common.fixturesDir + '/child-process-message-and-exit.js'); diff --git a/test/parallel/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js index 67a783b6b7..5a00dca066 100644 --- a/test/parallel/test-child-process-fork-dgram.js +++ b/test/parallel/test-child-process-fork-dgram.js @@ -13,10 +13,10 @@ * and the test will fail. */ +const common = require('../common'); var dgram = require('dgram'); var fork = require('child_process').fork; var assert = require('assert'); -var common = require('../common'); if (common.isWindows) { common.skip('Sending dgram sockets to child processes is ' + diff --git a/test/parallel/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js index 459e9992d0..e42b72f2b8 100644 --- a/test/parallel/test-child-process-fork-exec-path.js +++ b/test/parallel/test-child-process-fork-exec-path.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); var fs = require('fs'); var path = require('path'); -var common = require('../common'); var msg = {test: 'this'}; var nodePath = process.execPath; var copyPath = path.join(common.tmpDir, 'node-copy.exe'); diff --git a/test/parallel/test-child-process-fork-net2.js b/test/parallel/test-child-process-fork-net2.js index 454769b875..9489ed8cc0 100644 --- a/test/parallel/test-child-process-fork-net2.js +++ b/test/parallel/test-child-process-fork-net2.js @@ -1,6 +1,6 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); var fork = require('child_process').fork; var net = require('net'); var count = 12; diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js index 20b6e46910..6ae9374731 100644 --- a/test/parallel/test-child-process-spawn-typeerror.js +++ b/test/parallel/test-child-process-spawn-typeerror.js @@ -1,10 +1,10 @@ 'use strict'; +const common = require('../common'); const assert = require('assert'); const child_process = require('child_process'); const spawn = child_process.spawn; const fork = child_process.fork; const execFile = child_process.execFile; -const common = require('../common'); const cmd = common.isWindows ? 'rundll32' : 'ls'; const invalidcmd = 'hopefully_you_dont_have_this_on_your_machine'; const invalidArgsMsg = /Incorrect value of args option/; diff --git a/test/parallel/test-cli-syntax.js b/test/parallel/test-cli-syntax.js index 1118a63934..7718c42f31 100644 --- a/test/parallel/test-cli-syntax.js +++ b/test/parallel/test-cli-syntax.js @@ -1,11 +1,10 @@ 'use strict'; +const common = require('../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; const path = require('path'); -const common = require('../common'); - var node = process.execPath; // test both sets of arguments that check syntax diff --git a/test/parallel/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js index c0d9418528..319bc60b8c 100644 --- a/test/parallel/test-cluster-dgram-1.js +++ b/test/parallel/test-cluster-dgram-1.js @@ -1,10 +1,10 @@ 'use strict'; +const common = require('../common'); var NUM_WORKERS = 4; var PACKETS_PER_WORKER = 10; var assert = require('assert'); var cluster = require('cluster'); -var common = require('../common'); var dgram = require('dgram'); diff --git a/test/parallel/test-cluster-dgram-2.js b/test/parallel/test-cluster-dgram-2.js index f152c2342d..65f46a9cd8 100644 --- a/test/parallel/test-cluster-dgram-2.js +++ b/test/parallel/test-cluster-dgram-2.js @@ -1,9 +1,9 @@ 'use strict'; +const common = require('../common'); var NUM_WORKERS = 4; var PACKETS_PER_WORKER = 10; var cluster = require('cluster'); -var common = require('../common'); var dgram = require('dgram'); diff --git a/test/parallel/test-cluster-worker-no-exit.js b/test/parallel/test-cluster-worker-no-exit.js index b44831694c..0cec652b68 100644 --- a/test/parallel/test-cluster-worker-no-exit.js +++ b/test/parallel/test-cluster-worker-no-exit.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); var cluster = require('cluster'); var net = require('net'); -var common = require('../common'); var destroyed; var success; diff --git a/test/parallel/test-debugger-repeat-last.js b/test/parallel/test-debugger-repeat-last.js index 666a7bca74..157baada0c 100644 --- a/test/parallel/test-debugger-repeat-last.js +++ b/test/parallel/test-debugger-repeat-last.js @@ -1,10 +1,8 @@ 'use strict'; +const common = require('../common'); const path = require('path'); const spawn = require('child_process').spawn; const assert = require('assert'); - -const common = require('../common'); - const fixture = path.join( common.fixturesDir, 'debugger-repeat-last.js' diff --git a/test/parallel/test-debugger-util-regression.js b/test/parallel/test-debugger-util-regression.js index 92630b6a4b..069fb061c9 100644 --- a/test/parallel/test-debugger-util-regression.js +++ b/test/parallel/test-debugger-util-regression.js @@ -1,10 +1,9 @@ 'use strict'; +const common = require('../common'); const path = require('path'); const spawn = require('child_process').spawn; const assert = require('assert'); -const common = require('../common'); - const fixture = path.join( common.fixturesDir, 'debugger-util-regression-fixture.js' diff --git a/test/parallel/test-domain-with-abort-on-uncaught-exception.js b/test/parallel/test-domain-with-abort-on-uncaught-exception.js index 05d8dba482..423c77136f 100644 --- a/test/parallel/test-domain-with-abort-on-uncaught-exception.js +++ b/test/parallel/test-domain-with-abort-on-uncaught-exception.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); const assert = require('assert'); const fs = require('fs'); -const common = require('../common'); /* * The goal of this test is to make sure that: diff --git a/test/parallel/test-fs-read-stream-fd.js b/test/parallel/test-fs-read-stream-fd.js index 59ff306589..5af5200e30 100644 --- a/test/parallel/test-fs-read-stream-fd.js +++ b/test/parallel/test-fs-read-stream-fd.js @@ -1,10 +1,8 @@ 'use strict'; +const common = require('../common'); var fs = require('fs'); var assert = require('assert'); var path = require('path'); - -var common = require('../common'); - var file = path.join(common.tmpDir, '/read_stream_fd_test.txt'); var input = 'hello world'; var output = ''; diff --git a/test/parallel/test-fs-readfile-unlink.js b/test/parallel/test-fs-readfile-unlink.js index 50ad4172fc..e0539fa100 100644 --- a/test/parallel/test-fs-readfile-unlink.js +++ b/test/parallel/test-fs-readfile-unlink.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); const common = require('../common'); +const assert = require('assert'); const fs = require('fs'); const path = require('path'); const dirName = path.resolve(common.fixturesDir, 'test-readfile-unlink'); diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index 84ef01786d..1a9fdf5f3f 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); // disable strict server certificate validation by the client process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; -var common = require('../common'); var assert = require('assert'); if (!common.hasCrypto) { diff --git a/test/parallel/test-https-req-split.js b/test/parallel/test-https-req-split.js index 6dc6097dc2..b49c17f288 100644 --- a/test/parallel/test-https-req-split.js +++ b/test/parallel/test-https-req-split.js @@ -1,9 +1,8 @@ 'use strict'; +const common = require('../common'); // disable strict server certificate validation by the client process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; -var common = require('../common'); - if (!common.hasCrypto) { common.skip('missing crypto'); return; diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js index 639892f1a1..e62f8ad015 100644 --- a/test/parallel/test-https-strict.js +++ b/test/parallel/test-https-strict.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); // disable strict server certificate validation by the client process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; -var common = require('../common'); var assert = require('assert'); if (!common.hasCrypto) { diff --git a/test/parallel/test-path-makelong.js b/test/parallel/test-path-makelong.js index 2de630189c..50a77e9d87 100644 --- a/test/parallel/test-path-makelong.js +++ b/test/parallel/test-path-makelong.js @@ -1,7 +1,7 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); var path = require('path'); -var common = require('../common'); if (common.isWindows) { var file = path.join(common.fixturesDir, 'a.js'); diff --git a/test/parallel/test-process-env.js b/test/parallel/test-process-env.js index b5e62324ac..33a1d9674e 100644 --- a/test/parallel/test-process-env.js +++ b/test/parallel/test-process-env.js @@ -1,10 +1,10 @@ 'use strict'; /* eslint-disable max-len */ +require('../common'); // first things first, set the timezone; see tzset(3) process.env.TZ = 'Europe/Amsterdam'; -require('../common'); var assert = require('assert'); var spawn = require('child_process').spawn; diff --git a/test/parallel/test-process-no-deprecation.js b/test/parallel/test-process-no-deprecation.js index e3f3aad107..9185f8beb5 100644 --- a/test/parallel/test-process-no-deprecation.js +++ b/test/parallel/test-process-no-deprecation.js @@ -4,9 +4,9 @@ // The --no-warnings flag only supresses writing the warning to stderr, not the // emission of the corresponding event. This test file can be run without it. +const common = require('../common'); process.noDeprecation = true; -const common = require('../common'); const assert = require('assert'); function listener() { diff --git a/test/parallel/test-regress-GH-1899.js b/test/parallel/test-regress-GH-1899.js index 98396aae13..37fdd34bde 100644 --- a/test/parallel/test-regress-GH-1899.js +++ b/test/parallel/test-regress-GH-1899.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); var path = require('path'); var assert = require('assert'); var spawn = require('child_process').spawn; -var common = require('../common'); var child = spawn(process.argv[0], [ path.join(common.fixturesDir, 'GH-1899-output.js') diff --git a/test/parallel/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js index 6bf3d26431..b9c5bc88af 100644 --- a/test/parallel/test-repl-.save.load.js +++ b/test/parallel/test-repl-.save.load.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); var join = require('path').join; var fs = require('fs'); -var common = require('../common'); common.refreshTmpDir(); diff --git a/test/parallel/test-repl-timeout-throw.js b/test/parallel/test-repl-timeout-throw.js index 6c540c9e31..35bb8967d3 100644 --- a/test/parallel/test-repl-timeout-throw.js +++ b/test/parallel/test-repl-timeout-throw.js @@ -1,6 +1,6 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); var spawn = require('child_process').spawn; diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js index 40107f5774..943cd60769 100644 --- a/test/parallel/test-setproctitle.js +++ b/test/parallel/test-setproctitle.js @@ -1,13 +1,13 @@ 'use strict'; // Original test written by Jakub Lekstan <kuebzky@gmail.com> +require('../common'); // FIXME add sunos support if ('linux freebsd darwin'.indexOf(process.platform) === -1) { console.log(`1..0 # Skipped: Unsupported platform [${process.platform}]`); return; } -require('../common'); var assert = require('assert'); var exec = require('child_process').exec; var path = require('path'); diff --git a/test/parallel/test-tick-processor.js b/test/parallel/test-tick-processor.js index 550061499a..71f573dece 100644 --- a/test/parallel/test-tick-processor.js +++ b/test/parallel/test-tick-processor.js @@ -1,8 +1,8 @@ 'use strict'; +const common = require('../common'); const fs = require('fs'); const assert = require('assert'); const cp = require('child_process'); -const common = require('../common'); // TODO(mhdawson) Currently the test-tick-processor functionality in V8 // depends on addresses being smaller than a full 64 bits. Aix supports diff --git a/test/parallel/test-timers-blocking-callback.js b/test/parallel/test-timers-blocking-callback.js index 114c435a6a..ceac19054c 100644 --- a/test/parallel/test-timers-blocking-callback.js +++ b/test/parallel/test-timers-blocking-callback.js @@ -22,8 +22,8 @@ * is not empty (see testAddingTimerToNonEmptyTimersList). */ -const assert = require('assert'); const common = require('../common'); +const assert = require('assert'); const Timer = process.binding('timer_wrap').Timer; const TIMEOUT = 100; diff --git a/test/parallel/test-timers-nested.js b/test/parallel/test-timers-nested.js index 17b397d33c..d5d272ed2e 100644 --- a/test/parallel/test-timers-nested.js +++ b/test/parallel/test-timers-nested.js @@ -1,7 +1,7 @@ 'use strict'; -const assert = require('assert'); const common = require('../common'); +const assert = require('assert'); // Make sure we test 0ms timers, since they would had always wanted to run on // the current tick, and greater than 0ms timers, for scenarios where the diff --git a/test/parallel/test-tls-client-default-ciphers.js b/test/parallel/test-tls-client-default-ciphers.js index ebfc072dd3..33766dfd5b 100644 --- a/test/parallel/test-tls-client-default-ciphers.js +++ b/test/parallel/test-tls-client-default-ciphers.js @@ -1,6 +1,6 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); if (!common.hasCrypto) { common.skip('missing crypto'); diff --git a/test/parallel/test-tls-close-error.js b/test/parallel/test-tls-close-error.js index d1964858c5..2da7a192c3 100644 --- a/test/parallel/test-tls-close-error.js +++ b/test/parallel/test-tls-close-error.js @@ -1,7 +1,7 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); if (!common.hasCrypto) { common.skip('missing crypto'); diff --git a/test/parallel/test-tls-empty-sni-context.js b/test/parallel/test-tls-empty-sni-context.js index 4ab1778ef6..52e9f14b64 100644 --- a/test/parallel/test-tls-empty-sni-context.js +++ b/test/parallel/test-tls-empty-sni-context.js @@ -1,12 +1,13 @@ 'use strict'; +const common = require('../common'); + if (!process.features.tls_sni) { console.log('1..0 # Skipped: node compiled without OpenSSL or ' + 'with old OpenSSL version.'); return; } -const common = require('../common'); const assert = require('assert'); if (!common.hasCrypto) { diff --git a/test/parallel/test-tls-handshake-error.js b/test/parallel/test-tls-handshake-error.js index efe458ebfb..e76a0961fb 100644 --- a/test/parallel/test-tls-handshake-error.js +++ b/test/parallel/test-tls-handshake-error.js @@ -1,7 +1,7 @@ 'use strict'; +const common = require('../common'); var assert = require('assert'); -var common = require('../common'); if (!common.hasCrypto) { common.skip('missing crypto'); |