diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26b083b86739..e1bf7f5a4a1a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,6 +32,7 @@ expect throughout each step of the process. * [Commit message guidelines](#commit-message-guidelines) * [Step 5: Rebase](#step-5-rebase) * [Step 6: Test](#step-6-test) + * [Step 6.5: Test Coverage](#step-65-test-coverage) * [Step 7: Push](#step-7-push) * [Step 8: Opening the Pull Request](#step-8-opening-the-pull-request) * [Step 9: Discuss and Update](#step-9-discuss-and-update) @@ -371,10 +372,16 @@ Bug fixes and features should always come with tests. A provided to make the process easier. Looking at other tests to see how they should be structured can also help. -The `test` directory within the `nodejs/node` repository is complex and it is -often not clear where a new test file should go. When in doubt, add new tests -to the `test/parallel/` directory and the right location will be sorted out -later. +Tests should be placed in a directory corresponding to the subsystem that +they exercise, e.g., `es-module` for ESM loader tests, `child-process` for +tests related to the `child-process` module. Tests can be further organized +into the following subtypes: + +* `subsystem/parallel`: tests that can be run in parallel with each other. + Most new tests should be placed in this location. +* `subsystem/pummel`: tests that should be run while the system is under + heavy load. +* `subsystem/sequential`: tests that should be run sequentially. Before submitting your changes in a Pull Request, always run the full Node.js test suite. To run the tests (including code linting) on Unix / macOS: @@ -420,6 +427,31 @@ $ ./node ./test/parallel/test-stream2-transform.js Remember to recompile with `make -j4` in between test runs if you change code in the `lib` or `src` directories. +#### Step 6.5: Test coverage + +A great way to find nooks and crannies of the codebase that could use more +testing is to use coverage reports. To generate a coverage report simply +run: + +```console +$ ./configure --coverage +$ make coverage +``` + +Afterwards a detailed HTML coverage report can be found in +`coverage/index.html`. + +It is also possible to generate coverage for a specific subsystem. For instance, +the following generates coverage for the `child-process` submodule: + +```console +$ ./configure --coverage +$ CI_JS_SUITES=child-process* CI_NATIVE_SUITES= make coverage +``` + +recent coverage reports can be found at +[coverage.nodejs.org](https://coverage.nodejs.org/). + #### Step 7: Push Once you are sure your commits are ready to go, with passing tests and linting, diff --git a/Makefile b/Makefile index e9c5a2e6bbcf..f578d91baf6a 100644 --- a/Makefile +++ b/Makefile @@ -333,8 +333,8 @@ test-all: test-build test/gc/build/Release/binding.node test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind -CI_NATIVE_SUITES := addons addons-napi -CI_JS_SUITES := abort async-hooks doctool inspector known_issues message parallel pseudo-tty sequential +CI_NATIVE_SUITES ?= addons addons-napi +CI_JS_SUITES ?= DEFAULT_JS_SUITES # Build and test addons without building anything else test-ci-native: LOGLEVEL := info diff --git a/test/parallel/test-child-process-bad-stdio.js b/test/child-process/parallel/test-child-process-bad-stdio.js similarity index 97% rename from test/parallel/test-child-process-bad-stdio.js rename to test/child-process/parallel/test-child-process-bad-stdio.js index 45294d7d82d4..19de8a118832 100644 --- a/test/parallel/test-child-process-bad-stdio.js +++ b/test/child-process/parallel/test-child-process-bad-stdio.js @@ -1,6 +1,6 @@ 'use strict'; // Flags: --expose_internals -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-buffering.js b/test/child-process/parallel/test-child-process-buffering.js similarity index 97% rename from test/parallel/test-child-process-buffering.js rename to test/child-process/parallel/test-child-process-buffering.js index d37d255e18b0..1c0d7e8b8427 100644 --- a/test/parallel/test-child-process-buffering.js +++ b/test/child-process/parallel/test-child-process-buffering.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); function pwd(callback) { diff --git a/test/parallel/test-child-process-constructor.js b/test/child-process/parallel/test-child-process-constructor.js similarity index 98% rename from test/parallel/test-child-process-constructor.js rename to test/child-process/parallel/test-child-process-constructor.js index 92a148c0bab0..69ae6cb73671 100644 --- a/test/parallel/test-child-process-constructor.js +++ b/test/child-process/parallel/test-child-process-constructor.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { ChildProcess } = require('child_process'); assert.strictEqual(typeof ChildProcess, 'function'); diff --git a/test/parallel/test-child-process-custom-fds.js b/test/child-process/parallel/test-child-process-custom-fds.js similarity index 97% rename from test/parallel/test-child-process-custom-fds.js rename to test/child-process/parallel/test-child-process-custom-fds.js index 910babdd6fb8..49ff3ae55d5a 100644 --- a/test/parallel/test-child-process-custom-fds.js +++ b/test/child-process/parallel/test-child-process-custom-fds.js @@ -1,6 +1,6 @@ // Flags: --expose_internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const internalCp = require('internal/child_process'); const oldSpawnSync = internalCp.spawnSync; diff --git a/test/parallel/test-child-process-cwd.js b/test/child-process/parallel/test-child-process-cwd.js similarity index 98% rename from test/parallel/test-child-process-cwd.js rename to test/child-process/parallel/test-child-process-cwd.js index e1dcf85b0937..aee690a45bed 100644 --- a/test/parallel/test-child-process-cwd.js +++ b/test/child-process/parallel/test-child-process-cwd.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); let returns = 0; diff --git a/test/parallel/test-child-process-default-options.js b/test/child-process/parallel/test-child-process-default-options.js similarity index 97% rename from test/parallel/test-child-process-default-options.js rename to test/child-process/parallel/test-child-process-default-options.js index b09c2d316fa7..880258aba348 100644 --- a/test/parallel/test-child-process-default-options.js +++ b/test/child-process/parallel/test-child-process-default-options.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-detached.js b/test/child-process/parallel/test-child-process-detached.js similarity index 95% rename from test/parallel/test-child-process-detached.js rename to test/child-process/parallel/test-child-process-detached.js index f53983c29e79..f8c570fd5e77 100644 --- a/test/parallel/test-child-process-detached.js +++ b/test/child-process/parallel/test-child-process-detached.js @@ -20,9 +20,9 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const spawn = require('child_process').spawn; const childPath = fixtures.path('parent-process-nonpersistent.js'); diff --git a/test/parallel/test-child-process-disconnect.js b/test/child-process/parallel/test-child-process-disconnect.js similarity index 98% rename from test/parallel/test-child-process-disconnect.js rename to test/child-process/parallel/test-child-process-disconnect.js index 503ba906e7cf..130f1c271c50 100644 --- a/test/parallel/test-child-process-disconnect.js +++ b/test/child-process/parallel/test-child-process-disconnect.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; const net = require('net'); diff --git a/test/parallel/test-child-process-double-pipe.js b/test/child-process/parallel/test-child-process-double-pipe.js similarity index 98% rename from test/parallel/test-child-process-double-pipe.js rename to test/child-process/parallel/test-child-process-double-pipe.js index 08d5b1f9cfb7..95841d34d565 100644 --- a/test/parallel/test-child-process-double-pipe.js +++ b/test/child-process/parallel/test-child-process-double-pipe.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const os = require('os'); const util = require('util'); diff --git a/test/parallel/test-child-process-env.js b/test/child-process/parallel/test-child-process-env.js similarity index 97% rename from test/parallel/test-child-process-env.js rename to test/child-process/parallel/test-child-process-env.js index 4582c48fda5d..dc3a40f184c6 100644 --- a/test/parallel/test-child-process-env.js +++ b/test/child-process/parallel/test-child-process-env.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-exec-cwd.js b/test/child-process/parallel/test-child-process-exec-cwd.js similarity index 97% rename from test/parallel/test-child-process-exec-cwd.js rename to test/child-process/parallel/test-child-process-exec-cwd.js index c16f77f4c529..792e907cb782 100644 --- a/test/parallel/test-child-process-exec-cwd.js +++ b/test/child-process/parallel/test-child-process-exec-cwd.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const exec = require('child_process').exec; diff --git a/test/parallel/test-child-process-exec-encoding.js b/test/child-process/parallel/test-child-process-exec-encoding.js similarity index 97% rename from test/parallel/test-child-process-exec-encoding.js rename to test/child-process/parallel/test-child-process-exec-encoding.js index 781ee51d96dc..246d7175d85c 100644 --- a/test/parallel/test-child-process-exec-encoding.js +++ b/test/child-process/parallel/test-child-process-exec-encoding.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const stdoutData = 'foo'; diff --git a/test/parallel/test-child-process-exec-env.js b/test/child-process/parallel/test-child-process-exec-env.js similarity index 98% rename from test/parallel/test-child-process-exec-env.js rename to test/child-process/parallel/test-child-process-exec-env.js index c34fdb7b49a1..878505f84f24 100644 --- a/test/parallel/test-child-process-exec-env.js +++ b/test/child-process/parallel/test-child-process-exec-env.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const exec = require('child_process').exec; let success_count = 0; diff --git a/test/parallel/test-child-process-exec-error.js b/test/child-process/parallel/test-child-process-exec-error.js similarity index 97% rename from test/parallel/test-child-process-exec-error.js rename to test/child-process/parallel/test-child-process-exec-error.js index cb8ace0a9bf3..ff49f961418b 100644 --- a/test/parallel/test-child-process-exec-error.js +++ b/test/child-process/parallel/test-child-process-exec-error.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const child_process = require('child_process'); diff --git a/test/parallel/test-child-process-exec-kill-throws.js b/test/child-process/parallel/test-child-process-exec-kill-throws.js similarity index 96% rename from test/parallel/test-child-process-exec-kill-throws.js rename to test/child-process/parallel/test-child-process-exec-kill-throws.js index 35e5ff8b7bce..fe9dd289d9f9 100644 --- a/test/parallel/test-child-process-exec-kill-throws.js +++ b/test/child-process/parallel/test-child-process-exec-kill-throws.js @@ -1,6 +1,6 @@ 'use strict'; // Flags: --expose_internals -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-exec-maxBuffer.js b/test/child-process/parallel/test-child-process-exec-maxBuffer.js similarity index 96% rename from test/parallel/test-child-process-exec-maxBuffer.js rename to test/child-process/parallel/test-child-process-exec-maxBuffer.js index 6418f9176502..7c8cd87329f0 100644 --- a/test/parallel/test-child-process-exec-maxBuffer.js +++ b/test/child-process/parallel/test-child-process-exec-maxBuffer.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-exec-stdout-stderr-data-string.js b/test/child-process/parallel/test-child-process-exec-stdout-stderr-data-string.js similarity index 92% rename from test/parallel/test-child-process-exec-stdout-stderr-data-string.js rename to test/child-process/parallel/test-child-process-exec-stdout-stderr-data-string.js index 472d31f16ac9..5b49f929c0b3 100644 --- a/test/parallel/test-child-process-exec-stdout-stderr-data-string.js +++ b/test/child-process/parallel/test-child-process-exec-stdout-stderr-data-string.js @@ -1,6 +1,6 @@ 'use strict'; // Refs: https://github.com/nodejs/node/issues/7342 -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const exec = require('child_process').exec; diff --git a/test/parallel/test-child-process-exec-timeout.js b/test/child-process/parallel/test-child-process-exec-timeout.js similarity index 97% rename from test/parallel/test-child-process-exec-timeout.js rename to test/child-process/parallel/test-child-process-exec-timeout.js index ed25d9bff825..11194255111f 100644 --- a/test/parallel/test-child-process-exec-timeout.js +++ b/test/child-process/parallel/test-child-process-exec-timeout.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-execfile.js b/test/child-process/parallel/test-child-process-execfile.js similarity index 92% rename from test/parallel/test-child-process-execfile.js rename to test/child-process/parallel/test-child-process-execfile.js index 62cc7f534dc8..33806b1e4940 100644 --- a/test/parallel/test-child-process-execfile.js +++ b/test/child-process/parallel/test-child-process-execfile.js @@ -1,9 +1,9 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const execFile = require('child_process').execFile; const uv = process.binding('uv'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const fixture = fixtures.path('exit.js'); diff --git a/test/parallel/test-child-process-exit-code.js b/test/child-process/parallel/test-child-process-exit-code.js similarity index 95% rename from test/parallel/test-child-process-exit-code.js rename to test/child-process/parallel/test-child-process-exit-code.js index 7f5e54be42f6..44e258e77b54 100644 --- a/test/parallel/test-child-process-exit-code.js +++ b/test/child-process/parallel/test-child-process-exit-code.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const exitScript = fixtures.path('exit.js'); const exitChild = spawn(process.argv[0], [exitScript, 23]); diff --git a/test/parallel/test-child-process-flush-stdio.js b/test/child-process/parallel/test-child-process-flush-stdio.js similarity index 95% rename from test/parallel/test-child-process-flush-stdio.js rename to test/child-process/parallel/test-child-process-flush-stdio.js index a2f0bb9f71f3..578f4ab5c751 100644 --- a/test/parallel/test-child-process-flush-stdio.js +++ b/test/child-process/parallel/test-child-process-flush-stdio.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const cp = require('child_process'); const assert = require('assert'); diff --git a/test/parallel/test-child-process-fork-and-spawn.js b/test/child-process/parallel/test-child-process-fork-and-spawn.js similarity index 97% rename from test/parallel/test-child-process-fork-and-spawn.js rename to test/child-process/parallel/test-child-process-fork-and-spawn.js index 88e634ba8b05..7d2639601daf 100644 --- a/test/parallel/test-child-process-fork-and-spawn.js +++ b/test/child-process/parallel/test-child-process-fork-and-spawn.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { fork, spawn } = require('child_process'); diff --git a/test/parallel/test-child-process-fork-close.js b/test/child-process/parallel/test-child-process-fork-close.js similarity index 95% rename from test/parallel/test-child-process-fork-close.js rename to test/child-process/parallel/test-child-process-fork-close.js index bfaabd3d2f4e..3055202fbe26 100644 --- a/test/parallel/test-child-process-fork-close.js +++ b/test/child-process/parallel/test-child-process-fork-close.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const cp = fork(fixtures.path('child-process-message-and-exit.js')); diff --git a/test/parallel/test-child-process-fork-dgram.js b/test/child-process/parallel/test-child-process-fork-dgram.js similarity index 98% rename from test/parallel/test-child-process-fork-dgram.js rename to test/child-process/parallel/test-child-process-fork-dgram.js index 4aa36261dbb2..cd02f219932b 100644 --- a/test/parallel/test-child-process-fork-dgram.js +++ b/test/child-process/parallel/test-child-process-fork-dgram.js @@ -27,7 +27,7 @@ * child process. */ -const common = require('../common'); +const common = require('../../common'); if (common.isWindows) common.skip('Sending dgram sockets to child processes is not supported'); diff --git a/test/parallel/test-child-process-fork-exec-argv.js b/test/child-process/parallel/test-child-process-fork-exec-argv.js similarity index 98% rename from test/parallel/test-child-process-fork-exec-argv.js rename to test/child-process/parallel/test-child-process-fork-exec-argv.js index 433f83b35e06..04532a009d1e 100644 --- a/test/parallel/test-child-process-fork-exec-argv.js +++ b/test/child-process/parallel/test-child-process-fork-exec-argv.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const child_process = require('child_process'); const spawn = child_process.spawn; diff --git a/test/parallel/test-child-process-fork-exec-path.js b/test/child-process/parallel/test-child-process-fork-exec-path.js similarity index 98% rename from test/parallel/test-child-process-fork-exec-path.js rename to test/child-process/parallel/test-child-process-fork-exec-path.js index 06c6244eddaa..cdbddbf88787 100644 --- a/test/parallel/test-child-process-fork-exec-path.js +++ b/test/child-process/parallel/test-child-process-fork-exec-path.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fs = require('fs'); const path = require('path'); diff --git a/test/parallel/test-child-process-fork-net.js b/test/child-process/parallel/test-child-process-fork-net.js similarity index 99% rename from test/parallel/test-child-process-fork-net.js rename to test/child-process/parallel/test-child-process-fork-net.js index 1da92592ffc3..d301d5ab0b95 100644 --- a/test/parallel/test-child-process-fork-net.js +++ b/test/child-process/parallel/test-child-process-fork-net.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; const net = require('net'); diff --git a/test/parallel/test-child-process-fork-net2.js b/test/child-process/parallel/test-child-process-fork-net2.js similarity index 99% rename from test/parallel/test-child-process-fork-net2.js rename to test/child-process/parallel/test-child-process-fork-net2.js index b89368544719..7de8311e7385 100644 --- a/test/parallel/test-child-process-fork-net2.js +++ b/test/child-process/parallel/test-child-process-fork-net2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; const net = require('net'); diff --git a/test/parallel/test-child-process-fork-no-shell.js b/test/child-process/parallel/test-child-process-fork-no-shell.js similarity index 93% rename from test/parallel/test-child-process-fork-no-shell.js rename to test/child-process/parallel/test-child-process-fork-no-shell.js index 7a085913fbf4..ef3d6dafd927 100644 --- a/test/parallel/test-child-process-fork-no-shell.js +++ b/test/child-process/parallel/test-child-process-fork-no-shell.js @@ -1,6 +1,6 @@ 'use strict'; // This test verifies that the shell option is not supported by fork(). -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const expected = common.isWindows ? '%foo%' : '$foo'; diff --git a/test/parallel/test-child-process-fork-ref.js b/test/child-process/parallel/test-child-process-fork-ref.js similarity index 98% rename from test/parallel/test-child-process-fork-ref.js rename to test/child-process/parallel/test-child-process-fork-ref.js index 3eae2b242e9c..4338ffa822d1 100644 --- a/test/parallel/test-child-process-fork-ref.js +++ b/test/child-process/parallel/test-child-process-fork-ref.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; diff --git a/test/parallel/test-child-process-fork-ref2.js b/test/child-process/parallel/test-child-process-fork-ref2.js similarity index 97% rename from test/parallel/test-child-process-fork-ref2.js rename to test/child-process/parallel/test-child-process-fork-ref2.js index f34d67ee17fc..12b9fbb174dd 100644 --- a/test/parallel/test-child-process-fork-ref2.js +++ b/test/child-process/parallel/test-child-process-fork-ref2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const fork = require('child_process').fork; if (process.argv[2] === 'child') { diff --git a/test/parallel/test-child-process-fork-regr-gh-2847.js b/test/child-process/parallel/test-child-process-fork-regr-gh-2847.js similarity index 97% rename from test/parallel/test-child-process-fork-regr-gh-2847.js rename to test/child-process/parallel/test-child-process-fork-regr-gh-2847.js index 9e4412d1f737..f0766cf1dc23 100644 --- a/test/parallel/test-child-process-fork-regr-gh-2847.js +++ b/test/child-process/parallel/test-child-process-fork-regr-gh-2847.js @@ -2,7 +2,7 @@ // (asynchronously) to use the closed channel to it's creator caused a segfault. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cluster = require('cluster'); diff --git a/test/parallel/test-child-process-fork-stdio-string-variant.js b/test/child-process/parallel/test-child-process-fork-stdio-string-variant.js similarity index 90% rename from test/parallel/test-child-process-fork-stdio-string-variant.js rename to test/child-process/parallel/test-child-process-fork-stdio-string-variant.js index cdeb15975a7b..21fcf2ac2402 100644 --- a/test/parallel/test-child-process-fork-stdio-string-variant.js +++ b/test/child-process/parallel/test-child-process-fork-stdio-string-variant.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // Ensures that child_process.fork can accept string // variant of stdio parameter in options object and @@ -7,7 +7,7 @@ const common = require('../common'); const assert = require('assert'); const fork = require('child_process').fork; -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const childScript = fixtures.path('child-process-spawn-node'); const errorRegexp = /^TypeError: Incorrect value of stdio option:/; diff --git a/test/parallel/test-child-process-fork-stdio.js b/test/child-process/parallel/test-child-process-fork-stdio.js similarity index 96% rename from test/parallel/test-child-process-fork-stdio.js rename to test/child-process/parallel/test-child-process-fork-stdio.js index be0bdf19c358..91a1c2ca5e0a 100644 --- a/test/parallel/test-child-process-fork-stdio.js +++ b/test/child-process/parallel/test-child-process-fork-stdio.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const net = require('net'); diff --git a/test/parallel/test-child-process-fork.js b/test/child-process/parallel/test-child-process-fork.js similarity index 95% rename from test/parallel/test-child-process-fork.js rename to test/child-process/parallel/test-child-process-fork.js index 04318207a3ea..4c06d64cbba5 100644 --- a/test/parallel/test-child-process-fork.js +++ b/test/child-process/parallel/test-child-process-fork.js @@ -20,11 +20,11 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; const args = ['foo', 'bar']; -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const n = fork(fixtures.path('child-process-spawn-node.js'), args); diff --git a/test/parallel/test-child-process-fork3.js b/test/child-process/parallel/test-child-process-fork3.js similarity index 94% rename from test/parallel/test-child-process-fork3.js rename to test/child-process/parallel/test-child-process-fork3.js index 735a44195042..04344d020f20 100644 --- a/test/parallel/test-child-process-fork3.js +++ b/test/child-process/parallel/test-child-process-fork3.js @@ -20,8 +20,8 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const child_process = require('child_process'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); child_process.fork(fixtures.path('empty.js')); // should not hang diff --git a/test/parallel/test-child-process-internal.js b/test/child-process/parallel/test-child-process-internal.js similarity index 97% rename from test/parallel/test-child-process-internal.js rename to test/child-process/parallel/test-child-process-internal.js index 4b22b4060307..1ce9c7033dc7 100644 --- a/test/parallel/test-child-process-internal.js +++ b/test/child-process/parallel/test-child-process-internal.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); //messages diff --git a/test/parallel/test-child-process-ipc-next-tick.js b/test/child-process/parallel/test-child-process-ipc-next-tick.js similarity index 95% rename from test/parallel/test-child-process-ipc-next-tick.js rename to test/child-process/parallel/test-child-process-ipc-next-tick.js index b23aefc85d11..263441f3838a 100644 --- a/test/parallel/test-child-process-ipc-next-tick.js +++ b/test/child-process/parallel/test-child-process-ipc-next-tick.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const NUM_MESSAGES = 10; diff --git a/test/parallel/test-child-process-ipc.js b/test/child-process/parallel/test-child-process-ipc.js similarity index 96% rename from test/parallel/test-child-process-ipc.js rename to test/child-process/parallel/test-child-process-ipc.js index 36293cb73c1a..6760c916fc04 100644 --- a/test/parallel/test-child-process-ipc.js +++ b/test/child-process/parallel/test-child-process-ipc.js @@ -21,11 +21,11 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const { spawn } = require('child_process'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const sub = fixtures.path('echo.js'); diff --git a/test/parallel/test-child-process-kill.js b/test/child-process/parallel/test-child-process-kill.js similarity index 97% rename from test/parallel/test-child-process-kill.js rename to test/child-process/parallel/test-child-process-kill.js index 6f986c0ffa93..bf094c2c1323 100644 --- a/test/parallel/test-child-process-kill.js +++ b/test/child-process/parallel/test-child-process-kill.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; const cat = spawn(common.isWindows ? 'cmd' : 'cat'); diff --git a/test/parallel/test-child-process-promisified.js b/test/child-process/parallel/test-child-process-promisified.js similarity index 97% rename from test/parallel/test-child-process-promisified.js rename to test/child-process/parallel/test-child-process-promisified.js index 0fa9c68a92d8..1211fb7bb9e7 100644 --- a/test/parallel/test-child-process-promisified.js +++ b/test/child-process/parallel/test-child-process-promisified.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const child_process = require('child_process'); const { promisify } = require('util'); diff --git a/test/parallel/test-child-process-recv-handle.js b/test/child-process/parallel/test-child-process-recv-handle.js similarity index 98% rename from test/parallel/test-child-process-recv-handle.js rename to test/child-process/parallel/test-child-process-recv-handle.js index 24c6b07037f2..ffffaff46998 100644 --- a/test/parallel/test-child-process-recv-handle.js +++ b/test/child-process/parallel/test-child-process-recv-handle.js @@ -23,7 +23,7 @@ // Test that a Linux specific quirk in the handle passing protocol is handled // correctly. See https://github.com/joyent/node/issues/5330 for details. -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-send-after-close.js b/test/child-process/parallel/test-child-process-send-after-close.js similarity index 87% rename from test/parallel/test-child-process-send-after-close.js rename to test/child-process/parallel/test-child-process-send-after-close.js index 4e26d1261866..c35ad8b80368 100644 --- a/test/parallel/test-child-process-send-after-close.js +++ b/test/child-process/parallel/test-child-process-send-after-close.js @@ -1,8 +1,8 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const fixture = fixtures.path('empty.js'); const child = cp.fork(fixture); diff --git a/test/parallel/test-child-process-send-cb.js b/test/child-process/parallel/test-child-process-send-cb.js similarity index 93% rename from test/parallel/test-child-process-send-cb.js rename to test/child-process/parallel/test-child-process-send-cb.js index d65a1abd204a..beda08aa0c06 100644 --- a/test/parallel/test-child-process-send-cb.js +++ b/test/child-process/parallel/test-child-process-send-cb.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; diff --git a/test/parallel/test-child-process-send-keep-open.js b/test/child-process/parallel/test-child-process-send-keep-open.js similarity index 97% rename from test/parallel/test-child-process-send-keep-open.js rename to test/child-process/parallel/test-child-process-send-keep-open.js index 2d8a28121ac1..c6ba2c2a4ff4 100644 --- a/test/parallel/test-child-process-send-keep-open.js +++ b/test/child-process/parallel/test-child-process-send-keep-open.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const net = require('net'); diff --git a/test/parallel/test-child-process-send-returns-boolean.js b/test/child-process/parallel/test-child-process-send-returns-boolean.js similarity index 95% rename from test/parallel/test-child-process-send-returns-boolean.js rename to test/child-process/parallel/test-child-process-send-returns-boolean.js index 2fbba1a4544c..6efc32aed2d0 100644 --- a/test/parallel/test-child-process-send-returns-boolean.js +++ b/test/child-process/parallel/test-child-process-send-returns-boolean.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // subprocess.send() will return false if the channel has closed or when the // backlog of unsent messages exceeds a threshold that makes it unwise to send @@ -8,7 +8,7 @@ const common = require('../common'); const assert = require('assert'); const net = require('net'); const { fork, spawn } = require('child_process'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); // Just a script that stays alive (does not listen to `process.on('message')`). const subScript = fixtures.path('child-process-persistent.js'); diff --git a/test/parallel/test-child-process-send-type-error.js b/test/child-process/parallel/test-child-process-send-type-error.js similarity index 94% rename from test/parallel/test-child-process-send-type-error.js rename to test/child-process/parallel/test-child-process-send-type-error.js index 29dd45f6bdd7..7f7286a4c4b5 100644 --- a/test/parallel/test-child-process-send-type-error.js +++ b/test/child-process/parallel/test-child-process-send-type-error.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-send-utf8.js b/test/child-process/parallel/test-child-process-send-utf8.js similarity index 97% rename from test/parallel/test-child-process-send-utf8.js rename to test/child-process/parallel/test-child-process-send-utf8.js index 2609dd0d6d63..714f75d76135 100644 --- a/test/parallel/test-child-process-send-utf8.js +++ b/test/child-process/parallel/test-child-process-send-utf8.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; diff --git a/test/parallel/test-child-process-set-blocking.js b/test/child-process/parallel/test-child-process-set-blocking.js similarity index 97% rename from test/parallel/test-child-process-set-blocking.js rename to test/child-process/parallel/test-child-process-set-blocking.js index bca886ed55cb..1d14224e2ce7 100644 --- a/test/parallel/test-child-process-set-blocking.js +++ b/test/child-process/parallel/test-child-process-set-blocking.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const ch = require('child_process'); diff --git a/test/parallel/test-child-process-silent.js b/test/child-process/parallel/test-child-process-silent.js similarity index 99% rename from test/parallel/test-child-process-silent.js rename to test/child-process/parallel/test-child-process-silent.js index b280e101810c..59a0cc10ea48 100644 --- a/test/parallel/test-child-process-silent.js +++ b/test/child-process/parallel/test-child-process-silent.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const childProcess = require('child_process'); diff --git a/test/parallel/test-child-process-spawn-argv0.js b/test/child-process/parallel/test-child-process-spawn-argv0.js similarity index 96% rename from test/parallel/test-child-process-spawn-argv0.js rename to test/child-process/parallel/test-child-process-spawn-argv0.js index a426fe8053bb..9b557a88c24b 100644 --- a/test/parallel/test-child-process-spawn-argv0.js +++ b/test/child-process/parallel/test-child-process-spawn-argv0.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-spawn-error.js b/test/child-process/parallel/test-child-process-spawn-error.js similarity index 97% rename from test/parallel/test-child-process-spawn-error.js rename to test/child-process/parallel/test-child-process-spawn-error.js index 109effa5c833..5448aeab8b2f 100644 --- a/test/parallel/test-child-process-spawn-error.js +++ b/test/child-process/parallel/test-child-process-spawn-error.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const spawn = require('child_process').spawn; const assert = require('assert'); diff --git a/test/parallel/test-child-process-spawn-shell.js b/test/child-process/parallel/test-child-process-spawn-shell.js similarity index 97% rename from test/parallel/test-child-process-spawn-shell.js rename to test/child-process/parallel/test-child-process-spawn-shell.js index e9a753e91a4e..e29c303077d0 100644 --- a/test/parallel/test-child-process-spawn-shell.js +++ b/test/child-process/parallel/test-child-process-spawn-shell.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/child-process/parallel/test-child-process-spawn-typeerror.js similarity index 98% rename from test/parallel/test-child-process-spawn-typeerror.js rename to test/child-process/parallel/test-child-process-spawn-typeerror.js index d8ae4c758ce3..397db789900a 100644 --- a/test/parallel/test-child-process-spawn-typeerror.js +++ b/test/child-process/parallel/test-child-process-spawn-typeerror.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { spawn, fork, execFile } = require('child_process'); -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); 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-child-process-spawnsync-env.js b/test/child-process/parallel/test-child-process-spawnsync-env.js similarity index 98% rename from test/parallel/test-child-process-spawnsync-env.js rename to test/child-process/parallel/test-child-process-spawnsync-env.js index c8e11b5067c7..a32607442190 100644 --- a/test/parallel/test-child-process-spawnsync-env.js +++ b/test/child-process/parallel/test-child-process-spawnsync-env.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/child-process/parallel/test-child-process-spawnsync-input.js similarity index 99% rename from test/parallel/test-child-process-spawnsync-input.js rename to test/child-process/parallel/test-child-process-spawnsync-input.js index b44c2363847f..ec7acc881f52 100644 --- a/test/parallel/test-child-process-spawnsync-input.js +++ b/test/child-process/parallel/test-child-process-spawnsync-input.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); diff --git a/test/parallel/test-child-process-spawnsync-kill-signal.js b/test/child-process/parallel/test-child-process-spawnsync-kill-signal.js similarity index 97% rename from test/parallel/test-child-process-spawnsync-kill-signal.js rename to test/child-process/parallel/test-child-process-spawnsync-kill-signal.js index c9f601a0caff..ab087bf95cbf 100644 --- a/test/parallel/test-child-process-spawnsync-kill-signal.js +++ b/test/child-process/parallel/test-child-process-spawnsync-kill-signal.js @@ -1,6 +1,6 @@ // Flags: --expose_internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); diff --git a/test/parallel/test-child-process-spawnsync-maxbuf.js b/test/child-process/parallel/test-child-process-spawnsync-maxbuf.js similarity index 97% rename from test/parallel/test-child-process-spawnsync-maxbuf.js rename to test/child-process/parallel/test-child-process-spawnsync-maxbuf.js index 2d94c338bb72..db1c47459259 100644 --- a/test/parallel/test-child-process-spawnsync-maxbuf.js +++ b/test/child-process/parallel/test-child-process-spawnsync-maxbuf.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; const msgOut = 'this is stdout'; diff --git a/test/parallel/test-child-process-spawnsync-shell.js b/test/child-process/parallel/test-child-process-spawnsync-shell.js similarity index 98% rename from test/parallel/test-child-process-spawnsync-shell.js rename to test/child-process/parallel/test-child-process-spawnsync-shell.js index f0838ae116e3..47ca66de1721 100644 --- a/test/parallel/test-child-process-spawnsync-shell.js +++ b/test/child-process/parallel/test-child-process-spawnsync-shell.js @@ -1,6 +1,6 @@ // Flags: --expose_internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const cp = require('child_process'); const internalCp = require('internal/child_process'); diff --git a/test/parallel/test-child-process-spawnsync-timeout.js b/test/child-process/parallel/test-child-process-spawnsync-timeout.js similarity index 97% rename from test/parallel/test-child-process-spawnsync-timeout.js rename to test/child-process/parallel/test-child-process-spawnsync-timeout.js index 35df6cee22f5..96180b62abe8 100644 --- a/test/parallel/test-child-process-spawnsync-timeout.js +++ b/test/child-process/parallel/test-child-process-spawnsync-timeout.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; diff --git a/test/parallel/test-child-process-spawnsync-validation-errors.js b/test/child-process/parallel/test-child-process-spawnsync-validation-errors.js similarity index 99% rename from test/parallel/test-child-process-spawnsync-validation-errors.js rename to test/child-process/parallel/test-child-process-spawnsync-validation-errors.js index e586037e1d28..9304c3a06b12 100644 --- a/test/parallel/test-child-process-spawnsync-validation-errors.js +++ b/test/child-process/parallel/test-child-process-spawnsync-validation-errors.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; const signals = process.binding('constants').os.signals; diff --git a/test/parallel/test-child-process-spawnsync.js b/test/child-process/parallel/test-child-process-spawnsync.js similarity index 98% rename from test/parallel/test-child-process-spawnsync.js rename to test/child-process/parallel/test-child-process-spawnsync.js index 7b768d8403ac..8d70e5be2d54 100644 --- a/test/parallel/test-child-process-spawnsync.js +++ b/test/child-process/parallel/test-child-process-spawnsync.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; diff --git a/test/parallel/test-child-process-stdin-ipc.js b/test/child-process/parallel/test-child-process-stdin-ipc.js similarity index 97% rename from test/parallel/test-child-process-stdin-ipc.js rename to test/child-process/parallel/test-child-process-stdin-ipc.js index b162ced91609..7a4b724c4eb0 100644 --- a/test/parallel/test-child-process-stdin-ipc.js +++ b/test/child-process/parallel/test-child-process-stdin-ipc.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-stdin.js b/test/child-process/parallel/test-child-process-stdin.js similarity index 97% rename from test/parallel/test-child-process-stdin.js rename to test/child-process/parallel/test-child-process-stdin.js index 7f49d90f3a3f..d0500101043d 100644 --- a/test/parallel/test-child-process-stdin.js +++ b/test/child-process/parallel/test-child-process-stdin.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-stdio-big-write-end.js b/test/child-process/parallel/test-child-process-stdio-big-write-end.js similarity index 98% rename from test/parallel/test-child-process-stdio-big-write-end.js rename to test/child-process/parallel/test-child-process-stdio-big-write-end.js index 2ba409b09898..e87225f61241 100644 --- a/test/parallel/test-child-process-stdio-big-write-end.js +++ b/test/child-process/parallel/test-child-process-stdio-big-write-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); let bufsize = 0; diff --git a/test/parallel/test-child-process-stdio-inherit.js b/test/child-process/parallel/test-child-process-stdio-inherit.js similarity index 98% rename from test/parallel/test-child-process-stdio-inherit.js rename to test/child-process/parallel/test-child-process-stdio-inherit.js index b77391d87dca..2cf194fcc195 100644 --- a/test/parallel/test-child-process-stdio-inherit.js +++ b/test/child-process/parallel/test-child-process-stdio-inherit.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/parallel/test-child-process-stdio.js b/test/child-process/parallel/test-child-process-stdio.js similarity index 97% rename from test/parallel/test-child-process-stdio.js rename to test/child-process/parallel/test-child-process-stdio.js index f1d18d437fd4..e014d564d929 100644 --- a/test/parallel/test-child-process-stdio.js +++ b/test/child-process/parallel/test-child-process-stdio.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; diff --git a/test/parallel/test-child-process-stdout-flush-exit.js b/test/child-process/parallel/test-child-process-stdout-flush-exit.js similarity index 98% rename from test/parallel/test-child-process-stdout-flush-exit.js rename to test/child-process/parallel/test-child-process-stdout-flush-exit.js index f3fdf4949aad..2878a051fcb7 100644 --- a/test/parallel/test-child-process-stdout-flush-exit.js +++ b/test/child-process/parallel/test-child-process-stdout-flush-exit.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); // if child process output to console and exit diff --git a/test/parallel/test-child-process-stdout-flush.js b/test/child-process/parallel/test-child-process-stdout-flush.js similarity index 94% rename from test/parallel/test-child-process-stdout-flush.js rename to test/child-process/parallel/test-child-process-stdout-flush.js index bc549fb6f311..35d15e513343 100644 --- a/test/parallel/test-child-process-stdout-flush.js +++ b/test/child-process/parallel/test-child-process-stdout-flush.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; -const fixtures = require('../common/fixtures'); +const fixtures = require('../../common/fixtures'); const sub = fixtures.path('print-chars.js'); diff --git a/test/parallel/test-child-process-uid-gid.js b/test/child-process/parallel/test-child-process-uid-gid.js similarity index 92% rename from test/parallel/test-child-process-uid-gid.js rename to test/child-process/parallel/test-child-process-uid-gid.js index 621884cea627..5e3c1637446b 100644 --- a/test/parallel/test-child-process-uid-gid.js +++ b/test/child-process/parallel/test-child-process-uid-gid.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; const expectedError = common.isWindows ? /\bENOTSUP\b/ : /\bEPERM\b/; diff --git a/test/parallel/test-child-process-validate-stdio.js b/test/child-process/parallel/test-child-process-validate-stdio.js similarity index 97% rename from test/parallel/test-child-process-validate-stdio.js rename to test/child-process/parallel/test-child-process-validate-stdio.js index 129ca9822afc..a790e933d99c 100644 --- a/test/parallel/test-child-process-validate-stdio.js +++ b/test/child-process/parallel/test-child-process-validate-stdio.js @@ -1,7 +1,7 @@ 'use strict'; // Flags: --expose_internals -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const _validateStdio = require('internal/child_process')._validateStdio; diff --git a/test/child-process/parallel/testcfg.py b/test/child-process/parallel/testcfg.py new file mode 100644 index 000000000000..8b610b50b1d7 --- /dev/null +++ b/test/child-process/parallel/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.ParallelTestConfiguration(context, root, 'parallel') diff --git a/test/pummel/test-child-process-spawn-loop.js b/test/child-process/pummel/test-child-process-spawn-loop.js similarity index 97% rename from test/pummel/test-child-process-spawn-loop.js rename to test/child-process/pummel/test-child-process-spawn-loop.js index fdff82a6e4eb..2b5d3de77586 100644 --- a/test/pummel/test-child-process-spawn-loop.js +++ b/test/child-process/pummel/test-child-process-spawn-loop.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const spawn = require('child_process').spawn; diff --git a/test/child-process/pummel/testcfg.py b/test/child-process/pummel/testcfg.py new file mode 100644 index 000000000000..c91fe39dce27 --- /dev/null +++ b/test/child-process/pummel/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.SimpleTestConfiguration(context, root, 'pummel') diff --git a/test/sequential/test-child-process-emfile.js b/test/child-process/sequential/test-child-process-emfile.js similarity index 98% rename from test/sequential/test-child-process-emfile.js rename to test/child-process/sequential/test-child-process-emfile.js index e81b3a0ffec9..6dd8c278eb62 100644 --- a/test/sequential/test-child-process-emfile.js +++ b/test/child-process/sequential/test-child-process-emfile.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (common.isWindows) common.skip('no RLIMIT_NOFILE on Windows'); diff --git a/test/sequential/test-child-process-execsync.js b/test/child-process/sequential/test-child-process-execsync.js similarity index 98% rename from test/sequential/test-child-process-execsync.js rename to test/child-process/sequential/test-child-process-execsync.js index 63046517a9ca..f8113df5e7c3 100644 --- a/test/sequential/test-child-process-execsync.js +++ b/test/child-process/sequential/test-child-process-execsync.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { execFileSync, execSync } = require('child_process'); diff --git a/test/sequential/test-child-process-fork-getconnections.js b/test/child-process/sequential/test-child-process-fork-getconnections.js similarity index 98% rename from test/sequential/test-child-process-fork-getconnections.js rename to test/child-process/sequential/test-child-process-fork-getconnections.js index 931763cf3c70..2ca3b274ccea 100644 --- a/test/sequential/test-child-process-fork-getconnections.js +++ b/test/child-process/sequential/test-child-process-fork-getconnections.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const fork = require('child_process').fork; const net = require('net'); diff --git a/test/sequential/test-child-process-pass-fd.js b/test/child-process/sequential/test-child-process-pass-fd.js similarity index 97% rename from test/sequential/test-child-process-pass-fd.js rename to test/child-process/sequential/test-child-process-pass-fd.js index 8cc11f6c11f5..e81bc2c52aef 100644 --- a/test/sequential/test-child-process-pass-fd.js +++ b/test/child-process/sequential/test-child-process-pass-fd.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if ((process.config.variables.arm_version === '6') || (process.config.variables.arm_version === '7')) common.skip('Too slow for armv6 and armv7 bots'); diff --git a/test/child-process/sequential/testcfg.py b/test/child-process/sequential/testcfg.py new file mode 100644 index 000000000000..b1fce1810017 --- /dev/null +++ b/test/child-process/sequential/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.SimpleTestConfiguration(context, root, 'sequential') diff --git a/test/es-module/test-esm-pkg-over-ext.mjs b/test/es-module/test-esm-pkg-over-ext.mjs deleted file mode 100644 index 7e47c4c32694..000000000000 --- a/test/es-module/test-esm-pkg-over-ext.mjs +++ /dev/null @@ -1,8 +0,0 @@ -// Flags: --experimental-modules -/* eslint-disable required-modules */ - -import resolved from '../fixtures/module-pkg-over-ext/inner'; -import expected from '../fixtures/module-pkg-over-ext/inner/package.json'; -import assert from 'assert'; - -assert.strictEqual(resolved, expected); diff --git a/test/parallel/test-http-1.0-keep-alive.js b/test/http/parallel/test-http-1.0-keep-alive.js similarity index 99% rename from test/parallel/test-http-1.0-keep-alive.js rename to test/http/parallel/test-http-1.0-keep-alive.js index 6d117035a5c7..69f823f91235 100644 --- a/test/parallel/test-http-1.0-keep-alive.js +++ b/test/http/parallel/test-http-1.0-keep-alive.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-1.0.js b/test/http/parallel/test-http-1.0.js similarity index 99% rename from test/parallel/test-http-1.0.js rename to test/http/parallel/test-http-1.0.js index 47df50e2897b..31177dc2dae1 100644 --- a/test/parallel/test-http-1.0.js +++ b/test/http/parallel/test-http-1.0.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-abort-before-end.js b/test/http/parallel/test-http-abort-before-end.js similarity index 97% rename from test/parallel/test-http-abort-before-end.js rename to test/http/parallel/test-http-abort-before-end.js index 37d1291b0741..647c425d8fd0 100644 --- a/test/parallel/test-http-abort-before-end.js +++ b/test/http/parallel/test-http-abort-before-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-abort-client.js b/test/http/parallel/test-http-abort-client.js similarity index 97% rename from test/parallel/test-http-abort-client.js rename to test/http/parallel/test-http-abort-client.js index eda08ced97c5..dcae454dfd49 100644 --- a/test/parallel/test-http-abort-client.js +++ b/test/http/parallel/test-http-abort-client.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); let serverRes; diff --git a/test/parallel/test-http-abort-queued-2.js b/test/http/parallel/test-http-abort-queued-2.js similarity index 95% rename from test/parallel/test-http-abort-queued-2.js rename to test/http/parallel/test-http-abort-queued-2.js index 6282aa3da7ca..fdd047ce8f6c 100644 --- a/test/parallel/test-http-abort-queued-2.js +++ b/test/http/parallel/test-http-abort-queued-2.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-abort-queued.js b/test/http/parallel/test-http-abort-queued.js similarity index 98% rename from test/parallel/test-http-abort-queued.js rename to test/http/parallel/test-http-abort-queued.js index 224d0b606ea7..9f4ed46801d9 100644 --- a/test/parallel/test-http-abort-queued.js +++ b/test/http/parallel/test-http-abort-queued.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-abort-stream-end.js b/test/http/parallel/test-http-abort-stream-end.js similarity index 97% rename from test/parallel/test-http-abort-stream-end.js rename to test/http/parallel/test-http-abort-stream-end.js index 8d2704a1ee7d..adef6965fb0d 100644 --- a/test/parallel/test-http-abort-stream-end.js +++ b/test/http/parallel/test-http-abort-stream-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-after-connect.js b/test/http/parallel/test-http-after-connect.js similarity index 96% rename from test/parallel/test-http-after-connect.js rename to test/http/parallel/test-http-after-connect.js index 324186bab723..fde4c7ca00a7 100644 --- a/test/parallel/test-http-after-connect.js +++ b/test/http/parallel/test-http-after-connect.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const server = http.createServer(common.mustCall((req, res) => { req.resume(); diff --git a/test/parallel/test-http-agent-destroyed-socket.js b/test/http/parallel/test-http-agent-destroyed-socket.js similarity index 97% rename from test/parallel/test-http-agent-destroyed-socket.js rename to test/http/parallel/test-http-agent-destroyed-socket.js index 7970ce8bae0f..d5ddc846219e 100644 --- a/test/parallel/test-http-agent-destroyed-socket.js +++ b/test/http/parallel/test-http-agent-destroyed-socket.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const server = http.createServer(common.mustCall((req, res) => { res.writeHead(200, { 'Content-Type': 'text/plain' }); diff --git a/test/parallel/test-http-agent-error-on-idle.js b/test/http/parallel/test-http-agent-error-on-idle.js similarity index 96% rename from test/parallel/test-http-agent-error-on-idle.js rename to test/http/parallel/test-http-agent-error-on-idle.js index fce5e8f0324f..5f43a5cc7ac2 100644 --- a/test/parallel/test-http-agent-error-on-idle.js +++ b/test/http/parallel/test-http-agent-error-on-idle.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const Agent = http.Agent; diff --git a/test/parallel/test-http-agent-false.js b/test/http/parallel/test-http-agent-false.js similarity index 97% rename from test/parallel/test-http-agent-false.js rename to test/http/parallel/test-http-agent-false.js index 4d92d5e01e03..bcaf042781bd 100644 --- a/test/parallel/test-http-agent-false.js +++ b/test/http/parallel/test-http-agent-false.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); // sending `agent: false` when `port: null` is also passed in (i.e. the result diff --git a/test/parallel/test-http-agent-getname.js b/test/http/parallel/test-http-agent-getname.js similarity index 96% rename from test/parallel/test-http-agent-getname.js rename to test/http/parallel/test-http-agent-getname.js index f84996ec013e..e18eb153ba0f 100644 --- a/test/parallel/test-http-agent-getname.js +++ b/test/http/parallel/test-http-agent-getname.js @@ -1,6 +1,6 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-agent-keepalive.js b/test/http/parallel/test-http-agent-keepalive.js similarity index 99% rename from test/parallel/test-http-agent-keepalive.js rename to test/http/parallel/test-http-agent-keepalive.js index 2c8b6c1cc98d..5ebd8ce41284 100644 --- a/test/parallel/test-http-agent-keepalive.js +++ b/test/http/parallel/test-http-agent-keepalive.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const Agent = require('_http_agent').Agent; diff --git a/test/parallel/test-http-agent-maxsockets-regress-4050.js b/test/http/parallel/test-http-agent-maxsockets-regress-4050.js similarity index 90% rename from test/parallel/test-http-agent-maxsockets-regress-4050.js rename to test/http/parallel/test-http-agent-maxsockets-regress-4050.js index 57a90e4b05c7..3473e149ea59 100644 --- a/test/parallel/test-http-agent-maxsockets-regress-4050.js +++ b/test/http/parallel/test-http-agent-maxsockets-regress-4050.js @@ -1,8 +1,8 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const MAX_SOCKETS = 2; diff --git a/test/parallel/test-http-agent-maxsockets.js b/test/http/parallel/test-http-agent-maxsockets.js similarity index 92% rename from test/parallel/test-http-agent-maxsockets.js rename to test/http/parallel/test-http-agent-maxsockets.js index 4d422f4a90b4..4bce157ba3e3 100644 --- a/test/parallel/test-http-agent-maxsockets.js +++ b/test/http/parallel/test-http-agent-maxsockets.js @@ -1,8 +1,8 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const agent = new http.Agent({ keepAlive: true, diff --git a/test/parallel/test-http-agent-no-protocol.js b/test/http/parallel/test-http-agent-no-protocol.js similarity index 97% rename from test/parallel/test-http-agent-no-protocol.js rename to test/http/parallel/test-http-agent-no-protocol.js index b5a144abc93d..65db667dced1 100644 --- a/test/parallel/test-http-agent-no-protocol.js +++ b/test/http/parallel/test-http-agent-no-protocol.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-agent-null.js b/test/http/parallel/test-http-agent-null.js similarity index 97% rename from test/parallel/test-http-agent-null.js rename to test/http/parallel/test-http-agent-null.js index 0f87d098134b..7a7fd0f962a5 100644 --- a/test/parallel/test-http-agent-null.js +++ b/test/http/parallel/test-http-agent-null.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(common.mustCall((req, res) => { diff --git a/test/parallel/test-http-agent-uninitialized-with-handle.js b/test/http/parallel/test-http-agent-uninitialized-with-handle.js similarity index 95% rename from test/parallel/test-http-agent-uninitialized-with-handle.js rename to test/http/parallel/test-http-agent-uninitialized-with-handle.js index 77f01771734c..21e24bd3bd57 100644 --- a/test/parallel/test-http-agent-uninitialized-with-handle.js +++ b/test/http/parallel/test-http-agent-uninitialized-with-handle.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-agent-uninitialized.js b/test/http/parallel/test-http-agent-uninitialized.js similarity index 94% rename from test/parallel/test-http-agent-uninitialized.js rename to test/http/parallel/test-http-agent-uninitialized.js index dbb38e3b0f98..f3860b18b328 100644 --- a/test/parallel/test-http-agent-uninitialized.js +++ b/test/http/parallel/test-http-agent-uninitialized.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-agent.js b/test/http/parallel/test-http-agent.js similarity index 98% rename from test/parallel/test-http-agent.js rename to test/http/parallel/test-http-agent.js index 062809f0614a..49cfeaeed3b8 100644 --- a/test/parallel/test-http-agent.js +++ b/test/http/parallel/test-http-agent.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-allow-req-after-204-res.js b/test/http/parallel/test-http-allow-req-after-204-res.js similarity index 98% rename from test/parallel/test-http-allow-req-after-204-res.js rename to test/http/parallel/test-http-allow-req-after-204-res.js index cd55a4f17c2b..5d2fcf7dd5c1 100644 --- a/test/parallel/test-http-allow-req-after-204-res.js +++ b/test/http/parallel/test-http-allow-req-after-204-res.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-automatic-headers.js b/test/http/parallel/test-http-automatic-headers.js similarity index 96% rename from test/parallel/test-http-automatic-headers.js rename to test/http/parallel/test-http-automatic-headers.js index 5a6a8e524c76..6bc252e82151 100644 --- a/test/parallel/test-http-automatic-headers.js +++ b/test/http/parallel/test-http-automatic-headers.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-bind-twice.js b/test/http/parallel/test-http-bind-twice.js similarity index 97% rename from test/parallel/test-http-bind-twice.js rename to test/http/parallel/test-http-bind-twice.js index 50834cc5cb02..3d36364b7b1c 100644 --- a/test/parallel/test-http-bind-twice.js +++ b/test/http/parallel/test-http-bind-twice.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-blank-header.js b/test/http/parallel/test-http-blank-header.js similarity index 98% rename from test/parallel/test-http-blank-header.js rename to test/http/parallel/test-http-blank-header.js index ff86193a1bad..0a06e5805543 100644 --- a/test/parallel/test-http-blank-header.js +++ b/test/http/parallel/test-http-blank-header.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-buffer-sanity.js b/test/http/parallel/test-http-buffer-sanity.js similarity index 98% rename from test/parallel/test-http-buffer-sanity.js rename to test/http/parallel/test-http-buffer-sanity.js index 8dfccf7d5c68..faeef5d52507 100644 --- a/test/parallel/test-http-buffer-sanity.js +++ b/test/http/parallel/test-http-buffer-sanity.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-byteswritten.js b/test/http/parallel/test-http-byteswritten.js similarity index 98% rename from test/parallel/test-http-byteswritten.js rename to test/http/parallel/test-http-byteswritten.js index 32495613afa6..de917095854d 100644 --- a/test/parallel/test-http-byteswritten.js +++ b/test/http/parallel/test-http-byteswritten.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-catch-uncaughtexception.js b/test/http/parallel/test-http-catch-uncaughtexception.js similarity index 93% rename from test/parallel/test-http-catch-uncaughtexception.js rename to test/http/parallel/test-http-catch-uncaughtexception.js index 1366b6e26ea3..623c1d388d08 100644 --- a/test/parallel/test-http-catch-uncaughtexception.js +++ b/test/http/parallel/test-http-catch-uncaughtexception.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-chunk-problem.js b/test/http/parallel/test-http-chunk-problem.js similarity index 98% rename from test/parallel/test-http-chunk-problem.js rename to test/http/parallel/test-http-chunk-problem.js index 46a7406e7459..10232d76a0bb 100644 --- a/test/parallel/test-http-chunk-problem.js +++ b/test/http/parallel/test-http-chunk-problem.js @@ -1,6 +1,6 @@ 'use strict'; // http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919 -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-chunked-304.js b/test/http/parallel/test-http-chunked-304.js similarity index 98% rename from test/parallel/test-http-chunked-304.js rename to test/http/parallel/test-http-chunked-304.js index 2a8c33a5901f..ed3ced794c0c 100644 --- a/test/parallel/test-http-chunked-304.js +++ b/test/http/parallel/test-http-chunked-304.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-chunked.js b/test/http/parallel/test-http-chunked.js similarity index 98% rename from test/parallel/test-http-chunked.js rename to test/http/parallel/test-http-chunked.js index 9ae2932a5c41..62cd8d9f8d93 100644 --- a/test/parallel/test-http-chunked.js +++ b/test/http/parallel/test-http-chunked.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-abort-event.js b/test/http/parallel/test-http-client-abort-event.js similarity index 90% rename from test/parallel/test-http-client-abort-event.js rename to test/http/parallel/test-http-client-abort-event.js index 039206019640..b2b517b83830 100644 --- a/test/parallel/test-http-client-abort-event.js +++ b/test/http/parallel/test-http-client-abort-event.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(function(req, res) { res.end(); diff --git a/test/parallel/test-http-client-abort-no-agent.js b/test/http/parallel/test-http-client-abort-no-agent.js similarity index 91% rename from test/parallel/test-http-client-abort-no-agent.js rename to test/http/parallel/test-http-client-abort-no-agent.js index 2f9fda96d49b..bee0ed19e015 100644 --- a/test/parallel/test-http-client-abort-no-agent.js +++ b/test/http/parallel/test-http-client-abort-no-agent.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-client-abort-unix-socket.js b/test/http/parallel/test-http-client-abort-unix-socket.js similarity index 92% rename from test/parallel/test-http-client-abort-unix-socket.js rename to test/http/parallel/test-http-client-abort-unix-socket.js index 3fb2cd9b869f..2dcd76c42ae0 100644 --- a/test/parallel/test-http-client-abort-unix-socket.js +++ b/test/http/parallel/test-http-client-abort-unix-socket.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(common.mustNotCall()); diff --git a/test/parallel/test-http-client-abort.js b/test/http/parallel/test-http-client-abort.js similarity index 95% rename from test/parallel/test-http-client-abort.js rename to test/http/parallel/test-http-client-abort.js index 71fd2ad64cab..5b0b92e6ecf9 100644 --- a/test/parallel/test-http-client-abort.js +++ b/test/http/parallel/test-http-client-abort.js @@ -20,9 +20,9 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const N = 8; diff --git a/test/parallel/test-http-client-abort2.js b/test/http/parallel/test-http-client-abort2.js similarity index 97% rename from test/parallel/test-http-client-abort2.js rename to test/http/parallel/test-http-client-abort2.js index bc4b0e40838b..c95d491d46b1 100644 --- a/test/parallel/test-http-client-abort2.js +++ b/test/http/parallel/test-http-client-abort2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(common.mustCall((req, res) => { diff --git a/test/parallel/test-http-client-aborted-event.js b/test/http/parallel/test-http-client-aborted-event.js similarity index 91% rename from test/parallel/test-http-client-aborted-event.js rename to test/http/parallel/test-http-client-aborted-event.js index 1e7feb7d5860..2699199f6871 100644 --- a/test/parallel/test-http-client-aborted-event.js +++ b/test/http/parallel/test-http-client-aborted-event.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); let serverRes; diff --git a/test/parallel/test-http-client-agent.js b/test/http/parallel/test-http-client-agent.js similarity index 98% rename from test/parallel/test-http-client-agent.js rename to test/http/parallel/test-http-client-agent.js index f2d1b612b5af..ee78d3ac17b6 100644 --- a/test/parallel/test-http-client-agent.js +++ b/test/http/parallel/test-http-client-agent.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-check-http-token.js b/test/http/parallel/test-http-client-check-http-token.js similarity index 91% rename from test/parallel/test-http-client-check-http-token.js rename to test/http/parallel/test-http-client-check-http-token.js index 7a0c894504b1..a10dec0175e5 100644 --- a/test/parallel/test-http-client-check-http-token.js +++ b/test/http/parallel/test-http-client-check-http-token.js @@ -1,8 +1,8 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const expectedSuccesses = [undefined, null, 'GET', 'post']; const expectedFails = [-1, 1, 0, {}, true, false, [], Symbol()]; diff --git a/test/parallel/test-http-client-default-headers-exist.js b/test/http/parallel/test-http-client-default-headers-exist.js similarity index 96% rename from test/parallel/test-http-client-default-headers-exist.js rename to test/http/parallel/test-http-client-default-headers-exist.js index e0cf82e46220..7728cd34e7dc 100644 --- a/test/parallel/test-http-client-default-headers-exist.js +++ b/test/http/parallel/test-http-client-default-headers-exist.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const expectedHeaders = { 'DELETE': ['host', 'connection'], diff --git a/test/parallel/test-http-client-defaults.js b/test/http/parallel/test-http-client-defaults.js similarity index 95% rename from test/parallel/test-http-client-defaults.js rename to test/http/parallel/test-http-client-defaults.js index 43419d1dfd6c..0d6bb1108e67 100644 --- a/test/parallel/test-http-client-defaults.js +++ b/test/http/parallel/test-http-client-defaults.js @@ -1,6 +1,6 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const ClientRequest = require('http').ClientRequest; diff --git a/test/parallel/test-http-client-encoding.js b/test/http/parallel/test-http-client-encoding.js similarity index 97% rename from test/parallel/test-http-client-encoding.js rename to test/http/parallel/test-http-client-encoding.js index a4701cdbd0ab..8d7a3c284986 100644 --- a/test/parallel/test-http-client-encoding.js +++ b/test/http/parallel/test-http-client-encoding.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-get-url.js b/test/http/parallel/test-http-client-get-url.js similarity index 97% rename from test/parallel/test-http-client-get-url.js rename to test/http/parallel/test-http-client-get-url.js index 7f6bfb8ecaa1..9faacd383ff1 100644 --- a/test/parallel/test-http-client-get-url.js +++ b/test/http/parallel/test-http-client-get-url.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-client-immediate-error.js b/test/http/parallel/test-http-client-immediate-error.js similarity index 95% rename from test/parallel/test-http-client-immediate-error.js rename to test/http/parallel/test-http-client-immediate-error.js index 6b9cacb256f9..7117a15fa83d 100644 --- a/test/parallel/test-http-client-immediate-error.js +++ b/test/http/parallel/test-http-client-immediate-error.js @@ -3,7 +3,7 @@ // Make sure http.request() can catch immediate errors in // net.createConnection(). -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-client-keep-alive-release-before-finish.js b/test/http/parallel/test-http-client-keep-alive-release-before-finish.js similarity index 95% rename from test/parallel/test-http-client-keep-alive-release-before-finish.js rename to test/http/parallel/test-http-client-keep-alive-release-before-finish.js index 0efedc91e261..a61ab9ca67d1 100644 --- a/test/parallel/test-http-client-keep-alive-release-before-finish.js +++ b/test/http/parallel/test-http-client-keep-alive-release-before-finish.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer((req, res) => { diff --git a/test/parallel/test-http-client-parse-error.js b/test/http/parallel/test-http-client-parse-error.js similarity index 95% rename from test/parallel/test-http-client-parse-error.js rename to test/http/parallel/test-http-client-parse-error.js index 60f1ee45c8ef..37d5b5439d58 100644 --- a/test/parallel/test-http-client-parse-error.js +++ b/test/http/parallel/test-http-client-parse-error.js @@ -20,10 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); -const Countdown = require('../common/countdown'); +const Countdown = require('../../common/countdown'); const countdown = new Countdown(2, common.mustCall(() => server.close())); diff --git a/test/parallel/test-http-client-pipe-end.js b/test/http/parallel/test-http-client-pipe-end.js similarity index 97% rename from test/parallel/test-http-client-pipe-end.js rename to test/http/parallel/test-http-client-pipe-end.js index 4b9f168e9907..b687ea8a2e5e 100644 --- a/test/parallel/test-http-client-pipe-end.js +++ b/test/http/parallel/test-http-client-pipe-end.js @@ -22,7 +22,7 @@ 'use strict'; // see https://github.com/joyent/node/issues/3257 -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(function(req, res) { diff --git a/test/parallel/test-http-client-race-2.js b/test/http/parallel/test-http-client-race-2.js similarity index 99% rename from test/parallel/test-http-client-race-2.js rename to test/http/parallel/test-http-client-race-2.js index 951b8e0d7492..0657f16153dc 100644 --- a/test/parallel/test-http-client-race-2.js +++ b/test/http/parallel/test-http-client-race-2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-client-race.js b/test/http/parallel/test-http-client-race.js similarity index 98% rename from test/parallel/test-http-client-race.js rename to test/http/parallel/test-http-client-race.js index 60b6b497372c..eb50b495b255 100644 --- a/test/parallel/test-http-client-race.js +++ b/test/http/parallel/test-http-client-race.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-client-read-in-error.js b/test/http/parallel/test-http-client-read-in-error.js similarity index 97% rename from test/parallel/test-http-client-read-in-error.js rename to test/http/parallel/test-http-client-read-in-error.js index 69b24f73771d..e3fd11e47927 100644 --- a/test/parallel/test-http-client-read-in-error.js +++ b/test/http/parallel/test-http-client-read-in-error.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const net = require('net'); const http = require('http'); const util = require('util'); diff --git a/test/parallel/test-http-client-readable.js b/test/http/parallel/test-http-client-readable.js similarity index 98% rename from test/parallel/test-http-client-readable.js rename to test/http/parallel/test-http-client-readable.js index b381455e3699..35b728b25660 100644 --- a/test/parallel/test-http-client-readable.js +++ b/test/http/parallel/test-http-client-readable.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const util = require('util'); diff --git a/test/parallel/test-http-client-reject-chunked-with-content-length.js b/test/http/parallel/test-http-client-reject-chunked-with-content-length.js similarity index 95% rename from test/parallel/test-http-client-reject-chunked-with-content-length.js rename to test/http/parallel/test-http-client-reject-chunked-with-content-length.js index 8683b5726e27..38c8bd393c21 100644 --- a/test/parallel/test-http-client-reject-chunked-with-content-length.js +++ b/test/http/parallel/test-http-client-reject-chunked-with-content-length.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); const assert = require('assert'); diff --git a/test/parallel/test-http-client-reject-cr-no-lf.js b/test/http/parallel/test-http-client-reject-cr-no-lf.js similarity index 94% rename from test/parallel/test-http-client-reject-cr-no-lf.js rename to test/http/parallel/test-http-client-reject-cr-no-lf.js index bd303888bb63..ff17457baa90 100644 --- a/test/parallel/test-http-client-reject-cr-no-lf.js +++ b/test/http/parallel/test-http-client-reject-cr-no-lf.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); const assert = require('assert'); diff --git a/test/parallel/test-http-client-reject-unexpected-agent.js b/test/http/parallel/test-http-client-reject-unexpected-agent.js similarity index 97% rename from test/parallel/test-http-client-reject-unexpected-agent.js rename to test/http/parallel/test-http-client-reject-unexpected-agent.js index 23439baa32f6..6b4d20db3815 100644 --- a/test/parallel/test-http-client-reject-unexpected-agent.js +++ b/test/http/parallel/test-http-client-reject-unexpected-agent.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-req-error-dont-double-fire.js b/test/http/parallel/test-http-client-req-error-dont-double-fire.js similarity index 91% rename from test/parallel/test-http-client-req-error-dont-double-fire.js rename to test/http/parallel/test-http-client-req-error-dont-double-fire.js index 996540fc96c7..20d33f2aac12 100644 --- a/test/parallel/test-http-client-req-error-dont-double-fire.js +++ b/test/http/parallel/test-http-client-req-error-dont-double-fire.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); const http = require('http'); -const common = require('../common'); +const common = require('../../common'); // Invalid hostname as per https://tools.ietf.org/html/rfc2606#section-2 const host = 'this.hostname.is.invalid'; diff --git a/test/parallel/test-http-client-response-domain.js b/test/http/parallel/test-http-client-response-domain.js similarity index 98% rename from test/parallel/test-http-client-response-domain.js rename to test/http/parallel/test-http-client-response-domain.js index ff73fd51cc5d..c21ac359902b 100644 --- a/test/parallel/test-http-client-response-domain.js +++ b/test/http/parallel/test-http-client-response-domain.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const domain = require('domain'); diff --git a/test/parallel/test-http-client-timeout-agent.js b/test/http/parallel/test-http-client-timeout-agent.js similarity index 99% rename from test/parallel/test-http-client-timeout-agent.js rename to test/http/parallel/test-http-client-timeout-agent.js index 641de122d57a..b284fe70ddb1 100644 --- a/test/parallel/test-http-client-timeout-agent.js +++ b/test/http/parallel/test-http-client-timeout-agent.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-timeout-event.js b/test/http/parallel/test-http-client-timeout-event.js similarity index 97% rename from test/parallel/test-http-client-timeout-event.js rename to test/http/parallel/test-http-client-timeout-event.js index c76d56ef2564..422103758fed 100644 --- a/test/parallel/test-http-client-timeout-event.js +++ b/test/http/parallel/test-http-client-timeout-event.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const options = { diff --git a/test/parallel/test-http-client-timeout-option-listeners.js b/test/http/parallel/test-http-client-timeout-option-listeners.js similarity index 96% rename from test/parallel/test-http-client-timeout-option-listeners.js rename to test/http/parallel/test-http-client-timeout-option-listeners.js index 727b5fddf096..9027691d155b 100644 --- a/test/parallel/test-http-client-timeout-option-listeners.js +++ b/test/http/parallel/test-http-client-timeout-option-listeners.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-client-timeout-option.js b/test/http/parallel/test-http-client-timeout-option.js similarity index 95% rename from test/parallel/test-http-client-timeout-option.js rename to test/http/parallel/test-http-client-timeout-option.js index 6741fbe0bd1e..bb0686c297b6 100644 --- a/test/parallel/test-http-client-timeout-option.js +++ b/test/http/parallel/test-http-client-timeout-option.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-timeout-with-data.js b/test/http/parallel/test-http-client-timeout-with-data.js similarity index 98% rename from test/parallel/test-http-client-timeout-with-data.js rename to test/http/parallel/test-http-client-timeout-with-data.js index bc5670b6939e..3d4d466b9228 100644 --- a/test/parallel/test-http-client-timeout-with-data.js +++ b/test/http/parallel/test-http-client-timeout-with-data.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-timeout.js b/test/http/parallel/test-http-client-timeout.js similarity index 98% rename from test/parallel/test-http-client-timeout.js rename to test/http/parallel/test-http-client-timeout.js index bf0a3fbe54f8..191aae381a2d 100644 --- a/test/parallel/test-http-client-timeout.js +++ b/test/http/parallel/test-http-client-timeout.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-unescaped-path.js b/test/http/parallel/test-http-client-unescaped-path.js similarity index 97% rename from test/parallel/test-http-client-unescaped-path.js rename to test/http/parallel/test-http-client-unescaped-path.js index f3c680919df0..22d13c4df1c7 100644 --- a/test/parallel/test-http-client-unescaped-path.js +++ b/test/http/parallel/test-http-client-unescaped-path.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-upload-buf.js b/test/http/parallel/test-http-client-upload-buf.js similarity index 98% rename from test/parallel/test-http-client-upload-buf.js rename to test/http/parallel/test-http-client-upload-buf.js index b778d07a826b..9998c9ad1a4d 100644 --- a/test/parallel/test-http-client-upload-buf.js +++ b/test/http/parallel/test-http-client-upload-buf.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-client-upload.js b/test/http/parallel/test-http-client-upload.js similarity index 98% rename from test/parallel/test-http-client-upload.js rename to test/http/parallel/test-http-client-upload.js index 000bf1d58424..92966ed475f5 100644 --- a/test/parallel/test-http-client-upload.js +++ b/test/http/parallel/test-http-client-upload.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-common.js b/test/http/parallel/test-http-common.js similarity index 98% rename from test/parallel/test-http-common.js rename to test/http/parallel/test-http-common.js index 1629856ce57d..e53b0899319d 100644 --- a/test/parallel/test-http-common.js +++ b/test/http/parallel/test-http-common.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const httpCommon = require('_http_common'); const checkIsHttpToken = httpCommon._checkIsHttpToken; diff --git a/test/parallel/test-http-conn-reset.js b/test/http/parallel/test-http-conn-reset.js similarity index 97% rename from test/parallel/test-http-conn-reset.js rename to test/http/parallel/test-http-conn-reset.js index ffb3aa07551b..74060f83903c 100644 --- a/test/parallel/test-http-conn-reset.js +++ b/test/http/parallel/test-http-conn-reset.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-connect-req-res.js b/test/http/parallel/test-http-connect-req-res.js similarity index 98% rename from test/parallel/test-http-connect-req-res.js rename to test/http/parallel/test-http-connect-req-res.js index 5db19aedde91..dd943780e613 100644 --- a/test/parallel/test-http-connect-req-res.js +++ b/test/http/parallel/test-http-connect-req-res.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-connect.js b/test/http/parallel/test-http-connect.js similarity index 98% rename from test/parallel/test-http-connect.js rename to test/http/parallel/test-http-connect.js index 4b251832ff1c..b245b5c69086 100644 --- a/test/parallel/test-http-connect.js +++ b/test/http/parallel/test-http-connect.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-content-length.js b/test/http/parallel/test-http-content-length.js similarity index 98% rename from test/parallel/test-http-content-length.js rename to test/http/parallel/test-http-content-length.js index 3d6882d92f04..e81416f698a7 100644 --- a/test/parallel/test-http-content-length.js +++ b/test/http/parallel/test-http-content-length.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-contentLength0.js b/test/http/parallel/test-http-contentLength0.js similarity index 98% rename from test/parallel/test-http-contentLength0.js rename to test/http/parallel/test-http-contentLength0.js index 975e2abe881a..f860e9b12b89 100644 --- a/test/parallel/test-http-contentLength0.js +++ b/test/http/parallel/test-http-contentLength0.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); // Simple test of Node's HTTP Client choking on a response diff --git a/test/parallel/test-http-createConnection.js b/test/http/parallel/test-http-createConnection.js similarity index 98% rename from test/parallel/test-http-createConnection.js rename to test/http/parallel/test-http-createConnection.js index a65b9a158c67..57730adcb768 100644 --- a/test/parallel/test-http-createConnection.js +++ b/test/http/parallel/test-http-createConnection.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); const assert = require('assert'); diff --git a/test/parallel/test-http-date-header.js b/test/http/parallel/test-http-date-header.js similarity index 98% rename from test/parallel/test-http-date-header.js rename to test/http/parallel/test-http-date-header.js index 386501c9f470..0739ca0f6ebe 100644 --- a/test/parallel/test-http-date-header.js +++ b/test/http/parallel/test-http-date-header.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-default-encoding.js b/test/http/parallel/test-http-default-encoding.js similarity index 98% rename from test/parallel/test-http-default-encoding.js rename to test/http/parallel/test-http-default-encoding.js index 9fb0cca6563b..69c07c20bef4 100644 --- a/test/parallel/test-http-default-encoding.js +++ b/test/http/parallel/test-http-default-encoding.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-default-port.js b/test/http/parallel/test-http-default-port.js similarity index 98% rename from test/parallel/test-http-default-port.js rename to test/http/parallel/test-http-default-port.js index beae62d3998e..36756d951959 100644 --- a/test/parallel/test-http-default-port.js +++ b/test/http/parallel/test-http-default-port.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-destroyed-socket-write2.js b/test/http/parallel/test-http-destroyed-socket-write2.js similarity index 98% rename from test/parallel/test-http-destroyed-socket-write2.js rename to test/http/parallel/test-http-destroyed-socket-write2.js index 99a0c4663a8b..388a48950d06 100644 --- a/test/parallel/test-http-destroyed-socket-write2.js +++ b/test/http/parallel/test-http-destroyed-socket-write2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); // Verify that ECONNRESET is raised when writing to a http request diff --git a/test/parallel/test-http-dns-error.js b/test/http/parallel/test-http-dns-error.js similarity index 98% rename from test/parallel/test-http-dns-error.js rename to test/http/parallel/test-http-dns-error.js index 723b71064768..7348f6a916ff 100644 --- a/test/parallel/test-http-dns-error.js +++ b/test/http/parallel/test-http-dns-error.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-double-content-length.js b/test/http/parallel/test-http-double-content-length.js similarity index 95% rename from test/parallel/test-http-double-content-length.js rename to test/http/parallel/test-http-double-content-length.js index 53f924d652dd..7d5c3f89695b 100644 --- a/test/parallel/test-http-double-content-length.js +++ b/test/http/parallel/test-http-double-content-length.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-end-throw-socket-handling.js b/test/http/parallel/test-http-end-throw-socket-handling.js similarity index 97% rename from test/parallel/test-http-end-throw-socket-handling.js rename to test/http/parallel/test-http-end-throw-socket-handling.js index b6da0a96eaf3..6852a3220cf1 100644 --- a/test/parallel/test-http-end-throw-socket-handling.js +++ b/test/http/parallel/test-http-end-throw-socket-handling.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); // Make sure that throwing in 'end' handler doesn't lock // up the socket forever. diff --git a/test/parallel/test-http-eof-on-connect.js b/test/http/parallel/test-http-eof-on-connect.js similarity index 97% rename from test/parallel/test-http-eof-on-connect.js rename to test/http/parallel/test-http-eof-on-connect.js index 7e244354c1cb..65b74fa4dc09 100644 --- a/test/parallel/test-http-eof-on-connect.js +++ b/test/http/parallel/test-http-eof-on-connect.js @@ -21,7 +21,7 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-exceptions.js b/test/http/parallel/test-http-exceptions.js similarity index 98% rename from test/parallel/test-http-exceptions.js rename to test/http/parallel/test-http-exceptions.js index 0b6ac5bdc1f7..6cbb3b6bc64e 100644 --- a/test/parallel/test-http-exceptions.js +++ b/test/http/parallel/test-http-exceptions.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); const server = http.createServer(function(req, res) { diff --git a/test/parallel/test-http-expect-continue.js b/test/http/parallel/test-http-expect-continue.js similarity index 99% rename from test/parallel/test-http-expect-continue.js rename to test/http/parallel/test-http-expect-continue.js index 7f97ce35927e..c5bbdf361fa7 100644 --- a/test/parallel/test-http-expect-continue.js +++ b/test/http/parallel/test-http-expect-continue.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-expect-handling.js b/test/http/parallel/test-http-expect-handling.js similarity index 96% rename from test/parallel/test-http-expect-handling.js rename to test/http/parallel/test-http-expect-handling.js index fd1f24497945..bf3cc4081c55 100644 --- a/test/parallel/test-http-expect-handling.js +++ b/test/http/parallel/test-http-expect-handling.js @@ -1,6 +1,6 @@ // Spec documentation http://httpwg.github.io/specs/rfc7231.html#header.expect 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-extra-response.js b/test/http/parallel/test-http-extra-response.js similarity index 98% rename from test/parallel/test-http-extra-response.js rename to test/http/parallel/test-http-extra-response.js index 7c9514232c7b..d49ca1da62ec 100644 --- a/test/parallel/test-http-extra-response.js +++ b/test/http/parallel/test-http-extra-response.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-flush-headers.js b/test/http/parallel/test-http-flush-headers.js similarity index 94% rename from test/parallel/test-http-flush-headers.js rename to test/http/parallel/test-http-flush-headers.js index 8ca5e92e5e02..d72218ec5413 100644 --- a/test/parallel/test-http-flush-headers.js +++ b/test/http/parallel/test-http-flush-headers.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-flush-response-headers.js b/test/http/parallel/test-http-flush-response-headers.js similarity index 93% rename from test/parallel/test-http-flush-response-headers.js rename to test/http/parallel/test-http-flush-response-headers.js index b8045568d49a..2f173d3f3c3f 100644 --- a/test/parallel/test-http-flush-response-headers.js +++ b/test/http/parallel/test-http-flush-response-headers.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-flush.js b/test/http/parallel/test-http-flush.js similarity index 98% rename from test/parallel/test-http-flush.js rename to test/http/parallel/test-http-flush.js index 24f43d5efecf..7d23a1528d96 100644 --- a/test/parallel/test-http-flush.js +++ b/test/http/parallel/test-http-flush.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); http.createServer(function(req, res) { diff --git a/test/parallel/test-http-full-response.js b/test/http/parallel/test-http-full-response.js similarity index 98% rename from test/parallel/test-http-full-response.js rename to test/http/parallel/test-http-full-response.js index 2f6fc8fc2a17..cb508110e770 100644 --- a/test/parallel/test-http-full-response.js +++ b/test/http/parallel/test-http-full-response.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); // This test requires the program 'ab' const http = require('http'); diff --git a/test/parallel/test-http-get-pipeline-problem.js b/test/http/parallel/test-http-get-pipeline-problem.js similarity index 98% rename from test/parallel/test-http-get-pipeline-problem.js rename to test/http/parallel/test-http-get-pipeline-problem.js index 8439f80a07a8..316d3a4824f9 100644 --- a/test/parallel/test-http-get-pipeline-problem.js +++ b/test/http/parallel/test-http-get-pipeline-problem.js @@ -23,7 +23,7 @@ // In previous versions of Node.js (e.g., 0.6.0), this sort of thing would halt // after http.globalAgent.maxSockets number of files. // See https://groups.google.com/forum/#!topic/nodejs-dev/V5fB69hFa9o -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const fs = require('fs'); diff --git a/test/parallel/test-http-head-request.js b/test/http/parallel/test-http-head-request.js similarity index 97% rename from test/parallel/test-http-head-request.js rename to test/http/parallel/test-http-head-request.js index 26d490d357dc..8368b4c917e8 100644 --- a/test/parallel/test-http-head-request.js +++ b/test/http/parallel/test-http-head-request.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const body = 'hello world\n'; diff --git a/test/parallel/test-http-head-response-has-no-body-end.js b/test/http/parallel/test-http-head-response-has-no-body-end.js similarity index 97% rename from test/parallel/test-http-head-response-has-no-body-end.js rename to test/http/parallel/test-http-head-response-has-no-body-end.js index 824a1bafe3a5..cab8c3dbd37b 100644 --- a/test/parallel/test-http-head-response-has-no-body-end.js +++ b/test/http/parallel/test-http-head-response-has-no-body-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); // This test is to make sure that when the HTTP server diff --git a/test/parallel/test-http-head-response-has-no-body.js b/test/http/parallel/test-http-head-response-has-no-body.js similarity index 97% rename from test/parallel/test-http-head-response-has-no-body.js rename to test/http/parallel/test-http-head-response-has-no-body.js index bd96d7161b7a..924d279dfcd5 100644 --- a/test/parallel/test-http-head-response-has-no-body.js +++ b/test/http/parallel/test-http-head-response-has-no-body.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); // This test is to make sure that when the HTTP server diff --git a/test/parallel/test-http-header-obstext.js b/test/http/parallel/test-http-header-obstext.js similarity index 92% rename from test/parallel/test-http-header-obstext.js rename to test/http/parallel/test-http-header-obstext.js index 23aea246d782..7ee2017769cb 100644 --- a/test/parallel/test-http-header-obstext.js +++ b/test/http/parallel/test-http-header-obstext.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // This test ensures that the http-parser can handle UTF-8 characters // in the http header. diff --git a/test/parallel/test-http-header-read.js b/test/http/parallel/test-http-header-read.js similarity index 98% rename from test/parallel/test-http-header-read.js rename to test/http/parallel/test-http-header-read.js index dcdabb12d83a..db7963ea71e5 100644 --- a/test/parallel/test-http-header-read.js +++ b/test/http/parallel/test-http-header-read.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-hex-write.js b/test/http/parallel/test-http-hex-write.js similarity index 97% rename from test/parallel/test-http-hex-write.js rename to test/http/parallel/test-http-hex-write.js index a3cbec6b36c0..d0c64bb80dc9 100644 --- a/test/parallel/test-http-hex-write.js +++ b/test/http/parallel/test-http-hex-write.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-host-header-ipv6-fail.js b/test/http/parallel/test-http-host-header-ipv6-fail.js similarity index 97% rename from test/parallel/test-http-host-header-ipv6-fail.js rename to test/http/parallel/test-http-host-header-ipv6-fail.js index 0c56afad7f28..0aa33de4a82c 100644 --- a/test/parallel/test-http-host-header-ipv6-fail.js +++ b/test/http/parallel/test-http-host-header-ipv6-fail.js @@ -9,7 +9,7 @@ * the IPv6 address should be enclosed in square brackets */ -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-host-headers.js b/test/http/parallel/test-http-host-headers.js similarity index 98% rename from test/parallel/test-http-host-headers.js rename to test/http/parallel/test-http-host-headers.js index 97d200ade1bb..fe7dd95e61b7 100644 --- a/test/parallel/test-http-host-headers.js +++ b/test/http/parallel/test-http-host-headers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); const httpServer = http.createServer(reqHandler); diff --git a/test/parallel/test-http-hostname-typechecking.js b/test/http/parallel/test-http-hostname-typechecking.js similarity index 97% rename from test/parallel/test-http-hostname-typechecking.js rename to test/http/parallel/test-http-hostname-typechecking.js index dbb98b7ae11c..a132763ffb7b 100644 --- a/test/parallel/test-http-hostname-typechecking.js +++ b/test/http/parallel/test-http-hostname-typechecking.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-incoming-matchKnownFields.js b/test/http/parallel/test-http-incoming-matchKnownFields.js similarity index 99% rename from test/parallel/test-http-incoming-matchKnownFields.js rename to test/http/parallel/test-http-incoming-matchKnownFields.js index 14ba8acd021f..ae28e2e2ecd2 100644 --- a/test/parallel/test-http-incoming-matchKnownFields.js +++ b/test/http/parallel/test-http-incoming-matchKnownFields.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const IncomingMessage = require('http').IncomingMessage; diff --git a/test/parallel/test-http-incoming-pipelined-socket-destroy.js b/test/http/parallel/test-http-incoming-pipelined-socket-destroy.js similarity index 98% rename from test/parallel/test-http-incoming-pipelined-socket-destroy.js rename to test/http/parallel/test-http-incoming-pipelined-socket-destroy.js index b9603a579169..b85c8755a98f 100644 --- a/test/parallel/test-http-incoming-pipelined-socket-destroy.js +++ b/test/http/parallel/test-http-incoming-pipelined-socket-destroy.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-invalid-path-chars.js b/test/http/parallel/test-http-invalid-path-chars.js similarity index 93% rename from test/parallel/test-http-invalid-path-chars.js rename to test/http/parallel/test-http-invalid-path-chars.js index c1d0baa62c3e..a11b1c96095d 100644 --- a/test/parallel/test-http-invalid-path-chars.js +++ b/test/http/parallel/test-http-invalid-path-chars.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-invalid-urls.js b/test/http/parallel/test-http-invalid-urls.js similarity index 93% rename from test/parallel/test-http-invalid-urls.js rename to test/http/parallel/test-http-invalid-urls.js index 039270fe4301..12f1f1edc7ce 100644 --- a/test/parallel/test-http-invalid-urls.js +++ b/test/http/parallel/test-http-invalid-urls.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-invalidheaderfield.js b/test/http/parallel/test-http-invalidheaderfield.js similarity index 96% rename from test/parallel/test-http-invalidheaderfield.js rename to test/http/parallel/test-http-invalidheaderfield.js index 9e844e8a425a..3ced8a396936 100644 --- a/test/parallel/test-http-invalidheaderfield.js +++ b/test/http/parallel/test-http-invalidheaderfield.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const EventEmitter = require('events'); diff --git a/test/parallel/test-http-invalidheaderfield2.js b/test/http/parallel/test-http-invalidheaderfield2.js similarity index 98% rename from test/parallel/test-http-invalidheaderfield2.js rename to test/http/parallel/test-http-invalidheaderfield2.js index 40415d9c3688..531595998e19 100644 --- a/test/parallel/test-http-invalidheaderfield2.js +++ b/test/http/parallel/test-http-invalidheaderfield2.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const inspect = require('util').inspect; const { _checkIsHttpToken, _checkInvalidHeaderChar } = require('_http_common'); diff --git a/test/parallel/test-http-keep-alive-close-on-header.js b/test/http/parallel/test-http-keep-alive-close-on-header.js similarity index 99% rename from test/parallel/test-http-keep-alive-close-on-header.js rename to test/http/parallel/test-http-keep-alive-close-on-header.js index f5fb9466db1f..8efc6a4dc3fe 100644 --- a/test/parallel/test-http-keep-alive-close-on-header.js +++ b/test/http/parallel/test-http-keep-alive-close-on-header.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-keep-alive.js b/test/http/parallel/test-http-keep-alive.js similarity index 98% rename from test/parallel/test-http-keep-alive.js rename to test/http/parallel/test-http-keep-alive.js index 42d534e8e6b4..3a9a456a4214 100644 --- a/test/parallel/test-http-keep-alive.js +++ b/test/http/parallel/test-http-keep-alive.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-keepalive-client.js b/test/http/parallel/test-http-keepalive-client.js similarity index 99% rename from test/parallel/test-http-keepalive-client.js rename to test/http/parallel/test-http-keepalive-client.js index 5a9277feee9a..8f176c263cfd 100644 --- a/test/parallel/test-http-keepalive-client.js +++ b/test/http/parallel/test-http-keepalive-client.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-keepalive-maxsockets.js b/test/http/parallel/test-http-keepalive-maxsockets.js similarity index 99% rename from test/parallel/test-http-keepalive-maxsockets.js rename to test/http/parallel/test-http-keepalive-maxsockets.js index 53d67b247977..726da6af378e 100644 --- a/test/parallel/test-http-keepalive-maxsockets.js +++ b/test/http/parallel/test-http-keepalive-maxsockets.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-keepalive-override.js b/test/http/parallel/test-http-keepalive-override.js similarity index 97% rename from test/parallel/test-http-keepalive-override.js rename to test/http/parallel/test-http-keepalive-override.js index d25fc319747a..a5918cf80607 100644 --- a/test/parallel/test-http-keepalive-override.js +++ b/test/http/parallel/test-http-keepalive-override.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-keepalive-request.js b/test/http/parallel/test-http-keepalive-request.js similarity index 99% rename from test/parallel/test-http-keepalive-request.js rename to test/http/parallel/test-http-keepalive-request.js index 574dea9ba562..f23093b726f5 100644 --- a/test/parallel/test-http-keepalive-request.js +++ b/test/http/parallel/test-http-keepalive-request.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-listening.js b/test/http/parallel/test-http-listening.js similarity index 89% rename from test/parallel/test-http-listening.js rename to test/http/parallel/test-http-listening.js index 3fd93f3e2e0b..119b247a0305 100644 --- a/test/parallel/test-http-listening.js +++ b/test/http/parallel/test-http-listening.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-localaddress-bind-error.js b/test/http/parallel/test-http-localaddress-bind-error.js similarity index 98% rename from test/parallel/test-http-localaddress-bind-error.js rename to test/http/parallel/test-http-localaddress-bind-error.js index d4bd72bae1d5..c995c0c301cb 100644 --- a/test/parallel/test-http-localaddress-bind-error.js +++ b/test/http/parallel/test-http-localaddress-bind-error.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-localaddress.js b/test/http/parallel/test-http-localaddress.js similarity index 98% rename from test/parallel/test-http-localaddress.js rename to test/http/parallel/test-http-localaddress.js index 0ed048688eef..7570cfaf3cbc 100644 --- a/test/parallel/test-http-localaddress.js +++ b/test/http/parallel/test-http-localaddress.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasMultiLocalhost()) common.skip('platform-specific test.'); diff --git a/test/parallel/test-http-malformed-request.js b/test/http/parallel/test-http-malformed-request.js similarity index 98% rename from test/parallel/test-http-malformed-request.js rename to test/http/parallel/test-http-malformed-request.js index 59816b513b3a..5cd6ed8cedbc 100644 --- a/test/parallel/test-http-malformed-request.js +++ b/test/http/parallel/test-http-malformed-request.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-many-ended-pipelines.js b/test/http/parallel/test-http-many-ended-pipelines.js similarity index 98% rename from test/parallel/test-http-many-ended-pipelines.js rename to test/http/parallel/test-http-many-ended-pipelines.js index d17090cec918..ada08763d85e 100644 --- a/test/parallel/test-http-many-ended-pipelines.js +++ b/test/http/parallel/test-http-many-ended-pipelines.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); // no warnings should happen! const trace = console.trace; diff --git a/test/parallel/test-http-max-headers-count.js b/test/http/parallel/test-http-max-headers-count.js similarity index 99% rename from test/parallel/test-http-max-headers-count.js rename to test/http/parallel/test-http-max-headers-count.js index 05f4f774c2c9..ab62d6623ce7 100644 --- a/test/parallel/test-http-max-headers-count.js +++ b/test/http/parallel/test-http-max-headers-count.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-methods.js b/test/http/parallel/test-http-methods.js similarity index 98% rename from test/parallel/test-http-methods.js rename to test/http/parallel/test-http-methods.js index f56d1a5fb3e3..5de98df449d0 100644 --- a/test/parallel/test-http-methods.js +++ b/test/http/parallel/test-http-methods.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-multi-line-headers.js b/test/http/parallel/test-http-multi-line-headers.js similarity index 97% rename from test/parallel/test-http-multi-line-headers.js rename to test/http/parallel/test-http-multi-line-headers.js index 99c48cd97b58..472028f72be6 100644 --- a/test/parallel/test-http-multi-line-headers.js +++ b/test/http/parallel/test-http-multi-line-headers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-mutable-headers.js b/test/http/parallel/test-http-mutable-headers.js similarity index 99% rename from test/parallel/test-http-mutable-headers.js rename to test/http/parallel/test-http-mutable-headers.js index 929a566caf55..3a0e6a04b264 100644 --- a/test/parallel/test-http-mutable-headers.js +++ b/test/http/parallel/test-http-mutable-headers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-no-content-length.js b/test/http/parallel/test-http-no-content-length.js similarity index 97% rename from test/parallel/test-http-no-content-length.js rename to test/http/parallel/test-http-no-content-length.js index a3a51c015ec8..f25f56f0fa58 100644 --- a/test/parallel/test-http-no-content-length.js +++ b/test/http/parallel/test-http-no-content-length.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-no-read-no-dump.js b/test/http/parallel/test-http-no-read-no-dump.js similarity index 96% rename from test/parallel/test-http-no-read-no-dump.js rename to test/http/parallel/test-http-no-read-no-dump.js index 17d36c56b2ee..70a062e49ab1 100644 --- a/test/parallel/test-http-no-read-no-dump.js +++ b/test/http/parallel/test-http-no-read-no-dump.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); let onPause = null; diff --git a/test/parallel/test-http-outgoing-finish-writable.js b/test/http/parallel/test-http-outgoing-finish-writable.js similarity index 95% rename from test/parallel/test-http-outgoing-finish-writable.js rename to test/http/parallel/test-http-outgoing-finish-writable.js index 23b456b4354e..4f97a82e8ea6 100644 --- a/test/parallel/test-http-outgoing-finish-writable.js +++ b/test/http/parallel/test-http-outgoing-finish-writable.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-outgoing-finish.js b/test/http/parallel/test-http-outgoing-finish.js similarity index 99% rename from test/parallel/test-http-outgoing-finish.js rename to test/http/parallel/test-http-outgoing-finish.js index a242a4728e24..a8dba263a0b8 100644 --- a/test/parallel/test-http-outgoing-finish.js +++ b/test/http/parallel/test-http-outgoing-finish.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js b/test/http/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js similarity index 96% rename from test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js rename to test/http/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js index 7249230cfadb..f811d9ef6e40 100644 --- a/test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js +++ b/test/http/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // Regression test for https://github.com/nodejs/node/issues/11788. diff --git a/test/parallel/test-http-outgoing-internal-headers.js b/test/http/parallel/test-http-outgoing-internal-headers.js similarity index 94% rename from test/parallel/test-http-outgoing-internal-headers.js rename to test/http/parallel/test-http-outgoing-internal-headers.js index e36917a970d9..8d9660bc9f42 100644 --- a/test/parallel/test-http-outgoing-internal-headers.js +++ b/test/http/parallel/test-http-outgoing-internal-headers.js @@ -1,6 +1,6 @@ // Flags: --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { outHeadersKey } = require('internal/http'); diff --git a/test/parallel/test-http-outgoing-message-inheritance.js b/test/http/parallel/test-http-outgoing-message-inheritance.js similarity index 94% rename from test/parallel/test-http-outgoing-message-inheritance.js rename to test/http/parallel/test-http-outgoing-message-inheritance.js index 05a241dc8bda..52aad87b46d3 100644 --- a/test/parallel/test-http-outgoing-message-inheritance.js +++ b/test/http/parallel/test-http-outgoing-message-inheritance.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const { OutgoingMessage } = require('http'); const { Writable } = require('stream'); const assert = require('assert'); diff --git a/test/parallel/test-http-outgoing-proto.js b/test/http/parallel/test-http-outgoing-proto.js similarity index 98% rename from test/parallel/test-http-outgoing-proto.js rename to test/http/parallel/test-http-outgoing-proto.js index 22eba0981f6f..f333e3f70c58 100644 --- a/test/parallel/test-http-outgoing-proto.js +++ b/test/http/parallel/test-http-outgoing-proto.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-outgoing-renderHeaders.js b/test/http/parallel/test-http-outgoing-renderHeaders.js similarity index 96% rename from test/parallel/test-http-outgoing-renderHeaders.js rename to test/http/parallel/test-http-outgoing-renderHeaders.js index 138ab967539e..b5fc62351ac9 100644 --- a/test/parallel/test-http-outgoing-renderHeaders.js +++ b/test/http/parallel/test-http-outgoing-renderHeaders.js @@ -1,7 +1,7 @@ 'use strict'; // Flags: --expose-internals -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const outHeadersKey = require('internal/http').outHeadersKey; diff --git a/test/parallel/test-http-parser-bad-ref.js b/test/http/parallel/test-http-parser-bad-ref.js similarity index 98% rename from test/parallel/test-http-parser-bad-ref.js rename to test/http/parallel/test-http-parser-bad-ref.js index 6e9fb2f9ac60..b3389005b140 100644 --- a/test/parallel/test-http-parser-bad-ref.js +++ b/test/http/parallel/test-http-parser-bad-ref.js @@ -4,7 +4,7 @@ // Flags: --expose_gc -require('../common'); +require('../../common'); const assert = require('assert'); const HTTPParser = process.binding('http_parser').HTTPParser; diff --git a/test/parallel/test-http-parser-free.js b/test/http/parallel/test-http-parser-free.js similarity index 98% rename from test/parallel/test-http-parser-free.js rename to test/http/parallel/test-http-parser-free.js index 1ead3c14928d..2d94a9646b42 100644 --- a/test/parallel/test-http-parser-free.js +++ b/test/http/parallel/test-http-parser-free.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const N = 100; diff --git a/test/parallel/test-http-parser.js b/test/http/parallel/test-http-parser.js similarity index 99% rename from test/parallel/test-http-parser.js rename to test/http/parallel/test-http-parser.js index 81aadf261691..8717e0b6b60d 100644 --- a/test/parallel/test-http-parser.js +++ b/test/http/parallel/test-http-parser.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const binding = process.binding('http_parser'); diff --git a/test/parallel/test-http-pause-resume-one-end.js b/test/http/parallel/test-http-pause-resume-one-end.js similarity index 97% rename from test/parallel/test-http-pause-resume-one-end.js rename to test/http/parallel/test-http-pause-resume-one-end.js index 4886a7d490e4..10af6bdd21a8 100644 --- a/test/parallel/test-http-pause-resume-one-end.js +++ b/test/http/parallel/test-http-pause-resume-one-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.Server(function(req, res) { diff --git a/test/parallel/test-http-pause.js b/test/http/parallel/test-http-pause.js similarity index 99% rename from test/parallel/test-http-pause.js rename to test/http/parallel/test-http-pause.js index 8fe942491089..5cfb6d497213 100644 --- a/test/parallel/test-http-pause.js +++ b/test/http/parallel/test-http-pause.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-pipe-fs.js b/test/http/parallel/test-http-pipe-fs.js similarity index 98% rename from test/parallel/test-http-pipe-fs.js rename to test/http/parallel/test-http-pipe-fs.js index 41508ed92d0f..83247a162d8a 100644 --- a/test/parallel/test-http-pipe-fs.js +++ b/test/http/parallel/test-http-pipe-fs.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const fs = require('fs'); const path = require('path'); diff --git a/test/parallel/test-http-pipeline-flood.js b/test/http/parallel/test-http-pipeline-flood.js similarity index 98% rename from test/parallel/test-http-pipeline-flood.js rename to test/http/parallel/test-http-pipeline-flood.js index fb0622d31492..c16f47f036b4 100644 --- a/test/parallel/test-http-pipeline-flood.js +++ b/test/http/parallel/test-http-pipeline-flood.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // Here we are testing the HTTP server module's flood prevention mechanism. // When writeable.write returns false (ie the underlying send() indicated the diff --git a/test/parallel/test-http-pipeline-regr-2639.js b/test/http/parallel/test-http-pipeline-regr-2639.js similarity index 96% rename from test/parallel/test-http-pipeline-regr-2639.js rename to test/http/parallel/test-http-pipeline-regr-2639.js index 133e4126683d..6c612051a98e 100644 --- a/test/parallel/test-http-pipeline-regr-2639.js +++ b/test/http/parallel/test-http-pipeline-regr-2639.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-pipeline-regr-3332.js b/test/http/parallel/test-http-pipeline-regr-3332.js similarity index 97% rename from test/parallel/test-http-pipeline-regr-3332.js rename to test/http/parallel/test-http-pipeline-regr-3332.js index abac05c0bc08..b4175ac774c4 100644 --- a/test/parallel/test-http-pipeline-regr-3332.js +++ b/test/http/parallel/test-http-pipeline-regr-3332.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-pipeline-regr-3508.js b/test/http/parallel/test-http-pipeline-regr-3508.js similarity index 97% rename from test/parallel/test-http-pipeline-regr-3508.js rename to test/http/parallel/test-http-pipeline-regr-3508.js index ff735818f681..3fcf811b539e 100644 --- a/test/parallel/test-http-pipeline-regr-3508.js +++ b/test/http/parallel/test-http-pipeline-regr-3508.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-proxy.js b/test/http/parallel/test-http-proxy.js similarity index 99% rename from test/parallel/test-http-proxy.js rename to test/http/parallel/test-http-proxy.js index a6267faaa671..51fe66c0da18 100644 --- a/test/parallel/test-http-proxy.js +++ b/test/http/parallel/test-http-proxy.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-raw-headers.js b/test/http/parallel/test-http-raw-headers.js similarity index 99% rename from test/parallel/test-http-raw-headers.js rename to test/http/parallel/test-http-raw-headers.js index eb3f7280f891..3357bcf0149c 100644 --- a/test/parallel/test-http-raw-headers.js +++ b/test/http/parallel/test-http-raw-headers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-regr-gh-2821.js b/test/http/parallel/test-http-regr-gh-2821.js similarity index 93% rename from test/parallel/test-http-regr-gh-2821.js rename to test/http/parallel/test-http-regr-gh-2821.js index 9f1df0a0f568..059d48dd8f7a 100644 --- a/test/parallel/test-http-regr-gh-2821.js +++ b/test/http/parallel/test-http-regr-gh-2821.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); const server = http.createServer(function(req, res) { diff --git a/test/parallel/test-http-remove-header-stays-removed.js b/test/http/parallel/test-http-remove-header-stays-removed.js similarity index 98% rename from test/parallel/test-http-remove-header-stays-removed.js rename to test/http/parallel/test-http-remove-header-stays-removed.js index 6617a1775441..b536a7c517b9 100644 --- a/test/parallel/test-http-remove-header-stays-removed.js +++ b/test/http/parallel/test-http-remove-header-stays-removed.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-request-dont-override-options.js b/test/http/parallel/test-http-request-dont-override-options.js similarity index 96% rename from test/parallel/test-http-request-dont-override-options.js rename to test/http/parallel/test-http-request-dont-override-options.js index 33ed2ed6c007..ca22b96f2d9f 100644 --- a/test/parallel/test-http-request-dont-override-options.js +++ b/test/http/parallel/test-http-request-dont-override-options.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-request-end-twice.js b/test/http/parallel/test-http-request-end-twice.js similarity index 98% rename from test/parallel/test-http-request-end-twice.js rename to test/http/parallel/test-http-request-end-twice.js index 525377d2e1cc..46fb33bc66a7 100644 --- a/test/parallel/test-http-request-end-twice.js +++ b/test/http/parallel/test-http-request-end-twice.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-request-end.js b/test/http/parallel/test-http-request-end.js similarity index 98% rename from test/parallel/test-http-request-end.js rename to test/http/parallel/test-http-request-end.js index 6dd5fa4e91b1..8cca8a4c1c45 100644 --- a/test/parallel/test-http-request-end.js +++ b/test/http/parallel/test-http-request-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-request-invalid-method-error.js b/test/http/parallel/test-http-request-invalid-method-error.js similarity index 87% rename from test/parallel/test-http-request-invalid-method-error.js rename to test/http/parallel/test-http-request-invalid-method-error.js index 59706e90c7ca..b9701f7bae53 100644 --- a/test/parallel/test-http-request-invalid-method-error.js +++ b/test/http/parallel/test-http-request-invalid-method-error.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-request-methods.js b/test/http/parallel/test-http-request-methods.js similarity index 98% rename from test/parallel/test-http-request-methods.js rename to test/http/parallel/test-http-request-methods.js index 3532d45c637c..668545fc7fbe 100644 --- a/test/parallel/test-http-request-methods.js +++ b/test/http/parallel/test-http-request-methods.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-res-write-after-end.js b/test/http/parallel/test-http-res-write-after-end.js similarity index 97% rename from test/parallel/test-http-res-write-after-end.js rename to test/http/parallel/test-http-res-write-after-end.js index 32c6cf2e0826..aad8238595a5 100644 --- a/test/parallel/test-http-res-write-after-end.js +++ b/test/http/parallel/test-http-res-write-after-end.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-res-write-end-dont-take-array.js b/test/http/parallel/test-http-res-write-end-dont-take-array.js similarity index 98% rename from test/parallel/test-http-res-write-end-dont-take-array.js rename to test/http/parallel/test-http-res-write-end-dont-take-array.js index fcf9da8c12b0..5c80b9471327 100644 --- a/test/parallel/test-http-res-write-end-dont-take-array.js +++ b/test/http/parallel/test-http-res-write-end-dont-take-array.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-response-add-header-after-sent.js b/test/http/parallel/test-http-response-add-header-after-sent.js similarity index 93% rename from test/parallel/test-http-response-add-header-after-sent.js rename to test/http/parallel/test-http-response-add-header-after-sent.js index 8329d3ea7ee5..2096c74965e0 100644 --- a/test/parallel/test-http-response-add-header-after-sent.js +++ b/test/http/parallel/test-http-response-add-header-after-sent.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-response-close.js b/test/http/parallel/test-http-response-close.js similarity index 97% rename from test/parallel/test-http-response-close.js rename to test/http/parallel/test-http-response-close.js index c58a5884d59d..10e6fe32efae 100644 --- a/test/parallel/test-http-response-close.js +++ b/test/http/parallel/test-http-response-close.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(common.mustCall(function(req, res) { diff --git a/test/parallel/test-http-response-multi-content-length.js b/test/http/parallel/test-http-response-multi-content-length.js similarity index 97% rename from test/parallel/test-http-response-multi-content-length.js rename to test/http/parallel/test-http-response-multi-content-length.js index 14015475ca70..48afdb01d8ac 100644 --- a/test/parallel/test-http-response-multi-content-length.js +++ b/test/http/parallel/test-http-response-multi-content-length.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-response-multiheaders.js b/test/http/parallel/test-http-response-multiheaders.js similarity index 97% rename from test/parallel/test-http-response-multiheaders.js rename to test/http/parallel/test-http-response-multiheaders.js index ccfc31192d37..b0271253eef8 100644 --- a/test/parallel/test-http-response-multiheaders.js +++ b/test/http/parallel/test-http-response-multiheaders.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-response-no-headers.js b/test/http/parallel/test-http-response-no-headers.js similarity index 98% rename from test/parallel/test-http-response-no-headers.js rename to test/http/parallel/test-http-response-no-headers.js index 87b0f8e67faf..69096575450f 100644 --- a/test/parallel/test-http-response-no-headers.js +++ b/test/http/parallel/test-http-response-no-headers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-response-readable.js b/test/http/parallel/test-http-response-readable.js similarity index 98% rename from test/parallel/test-http-response-readable.js rename to test/http/parallel/test-http-response-readable.js index ce0773200520..c116c9957a15 100644 --- a/test/parallel/test-http-response-readable.js +++ b/test/http/parallel/test-http-response-readable.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-response-remove-header-after-sent.js b/test/http/parallel/test-http-response-remove-header-after-sent.js similarity index 93% rename from test/parallel/test-http-response-remove-header-after-sent.js rename to test/http/parallel/test-http-response-remove-header-after-sent.js index e6adffc14452..851f9db526f3 100644 --- a/test/parallel/test-http-response-remove-header-after-sent.js +++ b/test/http/parallel/test-http-response-remove-header-after-sent.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-response-splitting.js b/test/http/parallel/test-http-response-splitting.js similarity index 97% rename from test/parallel/test-http-response-splitting.js rename to test/http/parallel/test-http-response-splitting.js index bf483b53e37c..ecdfe074135c 100644 --- a/test/parallel/test-http-response-splitting.js +++ b/test/http/parallel/test-http-response-splitting.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); const url = require('url'); diff --git a/test/parallel/test-http-response-status-message.js b/test/http/parallel/test-http-response-status-message.js similarity index 99% rename from test/parallel/test-http-response-status-message.js rename to test/http/parallel/test-http-response-status-message.js index e52abc57e6ce..3010670ff3ad 100644 --- a/test/parallel/test-http-response-status-message.js +++ b/test/http/parallel/test-http-response-status-message.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-response-statuscode.js b/test/http/parallel/test-http-response-statuscode.js similarity index 98% rename from test/parallel/test-http-response-statuscode.js rename to test/http/parallel/test-http-response-statuscode.js index 17fce6c2d0f1..864da87ab352 100644 --- a/test/parallel/test-http-response-statuscode.js +++ b/test/http/parallel/test-http-response-statuscode.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-same-map.js b/test/http/parallel/test-http-same-map.js similarity index 97% rename from test/parallel/test-http-same-map.js rename to test/http/parallel/test-http-same-map.js index 0adb73222de1..f10bd336f55e 100644 --- a/test/parallel/test-http-same-map.js +++ b/test/http/parallel/test-http-same-map.js @@ -1,7 +1,7 @@ // Flags: --allow_natives_syntax 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-server-client-error.js b/test/http/parallel/test-http-server-client-error.js similarity index 95% rename from test/parallel/test-http-server-client-error.js rename to test/http/parallel/test-http-server-client-error.js index 88c224f83741..097cf17438ac 100644 --- a/test/parallel/test-http-server-client-error.js +++ b/test/http/parallel/test-http-server-client-error.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-server-de-chunked-trailer.js b/test/http/parallel/test-http-server-de-chunked-trailer.js similarity index 96% rename from test/parallel/test-http-server-de-chunked-trailer.js rename to test/http/parallel/test-http-server-de-chunked-trailer.js index 72c40ed55926..a7f310f2d4c2 100644 --- a/test/parallel/test-http-server-de-chunked-trailer.js +++ b/test/http/parallel/test-http-server-de-chunked-trailer.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); // This test ensures that a Trailer header is set only when a chunked transfer // encoding is used. diff --git a/test/parallel/test-http-server-keep-alive-timeout.js b/test/http/parallel/test-http-server-keep-alive-timeout.js similarity index 97% rename from test/parallel/test-http-server-keep-alive-timeout.js rename to test/http/parallel/test-http-server-keep-alive-timeout.js index 767963fbdc2f..d6fcb773af9d 100644 --- a/test/parallel/test-http-server-keep-alive-timeout.js +++ b/test/http/parallel/test-http-server-keep-alive-timeout.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-server-multiheaders.js b/test/http/parallel/test-http-server-multiheaders.js similarity index 99% rename from test/parallel/test-http-server-multiheaders.js rename to test/http/parallel/test-http-server-multiheaders.js index 201a95c346ae..282f36a3f41a 100644 --- a/test/parallel/test-http-server-multiheaders.js +++ b/test/http/parallel/test-http-server-multiheaders.js @@ -24,7 +24,7 @@ // of the same header as per RFC2616: joining the handful of fields by ', ' // that support it, and dropping duplicates for other fields. -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-server-multiheaders2.js b/test/http/parallel/test-http-server-multiheaders2.js similarity index 99% rename from test/parallel/test-http-server-multiheaders2.js rename to test/http/parallel/test-http-server-multiheaders2.js index c4a9151862ee..f1af0057d800 100644 --- a/test/parallel/test-http-server-multiheaders2.js +++ b/test/http/parallel/test-http-server-multiheaders2.js @@ -24,7 +24,7 @@ // of the same header as per RFC2616: joining the handful of fields by ', ' // that support it, and dropping duplicates for other fields. -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-server-reject-chunked-with-content-length.js b/test/http/parallel/test-http-server-reject-chunked-with-content-length.js similarity index 95% rename from test/parallel/test-http-server-reject-chunked-with-content-length.js rename to test/http/parallel/test-http-server-reject-chunked-with-content-length.js index b3bc4295a84c..c5e3ca286be2 100644 --- a/test/parallel/test-http-server-reject-chunked-with-content-length.js +++ b/test/http/parallel/test-http-server-reject-chunked-with-content-length.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const net = require('net'); const assert = require('assert'); diff --git a/test/parallel/test-http-server-reject-cr-no-lf.js b/test/http/parallel/test-http-server-reject-cr-no-lf.js similarity index 94% rename from test/parallel/test-http-server-reject-cr-no-lf.js rename to test/http/parallel/test-http-server-reject-cr-no-lf.js index 5dace4f7bfd7..4cb83c2f48aa 100644 --- a/test/parallel/test-http-server-reject-cr-no-lf.js +++ b/test/http/parallel/test-http-server-reject-cr-no-lf.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const net = require('net'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-server-response-standalone.js b/test/http/parallel/test-http-server-response-standalone.js similarity index 94% rename from test/parallel/test-http-server-response-standalone.js rename to test/http/parallel/test-http-server-response-standalone.js index 7025c734b310..a1ad4219425c 100644 --- a/test/parallel/test-http-server-response-standalone.js +++ b/test/http/parallel/test-http-server-response-standalone.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const { ServerResponse } = require('http'); const { Writable } = require('stream'); const assert = require('assert'); diff --git a/test/parallel/test-http-server-stale-close.js b/test/http/parallel/test-http-server-stale-close.js similarity index 98% rename from test/parallel/test-http-server-stale-close.js rename to test/http/parallel/test-http-server-stale-close.js index b72c2b55a02f..dfcd1de168f0 100644 --- a/test/parallel/test-http-server-stale-close.js +++ b/test/http/parallel/test-http-server-stale-close.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); const fork = require('child_process').fork; diff --git a/test/parallel/test-http-server-unconsume-consume.js b/test/http/parallel/test-http-server-unconsume-consume.js similarity index 93% rename from test/parallel/test-http-server-unconsume-consume.js rename to test/http/parallel/test-http-server-unconsume-consume.js index 0135205eb14e..429da027f9db 100644 --- a/test/parallel/test-http-server-unconsume-consume.js +++ b/test/http/parallel/test-http-server-unconsume-consume.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const testServer = http.createServer(common.mustNotCall()); diff --git a/test/parallel/test-http-server-unconsume.js b/test/http/parallel/test-http-server-unconsume.js similarity index 96% rename from test/parallel/test-http-server-unconsume.js rename to test/http/parallel/test-http-server-unconsume.js index 9f80e9ea82de..ff7dbf600159 100644 --- a/test/parallel/test-http-server-unconsume.js +++ b/test/http/parallel/test-http-server-unconsume.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-server-write-after-end.js b/test/http/parallel/test-http-server-write-after-end.js similarity index 93% rename from test/parallel/test-http-server-write-after-end.js rename to test/http/parallel/test-http-server-write-after-end.js index 045cdcf4b75a..c05120350219 100644 --- a/test/parallel/test-http-server-write-after-end.js +++ b/test/http/parallel/test-http-server-write-after-end.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const assert = require('assert'); diff --git a/test/parallel/test-http-server.js b/test/http/parallel/test-http-server.js similarity index 99% rename from test/parallel/test-http-server.js rename to test/http/parallel/test-http-server.js index 567f2b3b31b8..56bdea136988 100644 --- a/test/parallel/test-http-server.js +++ b/test/http/parallel/test-http-server.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-set-cookies.js b/test/http/parallel/test-http-set-cookies.js similarity index 99% rename from test/parallel/test-http-set-cookies.js rename to test/http/parallel/test-http-set-cookies.js index 44a5f47bbb3d..4afc4102c3c0 100644 --- a/test/parallel/test-http-set-cookies.js +++ b/test/http/parallel/test-http-set-cookies.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-set-timeout-server.js b/test/http/parallel/test-http-set-timeout-server.js similarity index 99% rename from test/parallel/test-http-set-timeout-server.js rename to test/http/parallel/test-http-set-timeout-server.js index 7984fdfc0ffb..72c8c37226e0 100644 --- a/test/parallel/test-http-set-timeout-server.js +++ b/test/http/parallel/test-http-set-timeout-server.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-set-timeout.js b/test/http/parallel/test-http-set-timeout.js similarity index 97% rename from test/parallel/test-http-set-timeout.js rename to test/http/parallel/test-http-set-timeout.js index 5440c23c2155..0f7872e81fca 100644 --- a/test/parallel/test-http-set-timeout.js +++ b/test/http/parallel/test-http-set-timeout.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-set-trailers.js b/test/http/parallel/test-http-set-trailers.js similarity index 98% rename from test/parallel/test-http-set-trailers.js rename to test/http/parallel/test-http-set-trailers.js index 204207dfa8dc..7d2a7c45ca74 100644 --- a/test/parallel/test-http-set-trailers.js +++ b/test/http/parallel/test-http-set-trailers.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-should-keep-alive.js b/test/http/parallel/test-http-should-keep-alive.js similarity index 99% rename from test/parallel/test-http-should-keep-alive.js rename to test/http/parallel/test-http-should-keep-alive.js index dd4709d6946a..599f3478db89 100644 --- a/test/parallel/test-http-should-keep-alive.js +++ b/test/http/parallel/test-http-should-keep-alive.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-status-code.js b/test/http/parallel/test-http-status-code.js similarity index 98% rename from test/parallel/test-http-status-code.js rename to test/http/parallel/test-http-status-code.js index 802565f26bb6..7f7ee6860a0e 100644 --- a/test/parallel/test-http-status-code.js +++ b/test/http/parallel/test-http-status-code.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-status-message.js b/test/http/parallel/test-http-status-message.js similarity index 98% rename from test/parallel/test-http-status-message.js rename to test/http/parallel/test-http-status-message.js index 10d17295814e..5115e0e5b0cf 100644 --- a/test/parallel/test-http-status-message.js +++ b/test/http/parallel/test-http-status-message.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-status-reason-invalid-chars.js b/test/http/parallel/test-http-status-reason-invalid-chars.js similarity index 96% rename from test/parallel/test-http-status-reason-invalid-chars.js rename to test/http/parallel/test-http-status-reason-invalid-chars.js index 75ccb2c2430c..87dc1063ba5d 100644 --- a/test/parallel/test-http-status-reason-invalid-chars.js +++ b/test/http/parallel/test-http-status-reason-invalid-chars.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-timeout-overflow.js b/test/http/parallel/test-http-timeout-overflow.js similarity index 98% rename from test/parallel/test-http-timeout-overflow.js rename to test/http/parallel/test-http-timeout-overflow.js index dc93b3da7ae2..873146e0c7c9 100644 --- a/test/parallel/test-http-timeout-overflow.js +++ b/test/http/parallel/test-http-timeout-overflow.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-timeout.js b/test/http/parallel/test-http-timeout.js similarity index 98% rename from test/parallel/test-http-timeout.js rename to test/http/parallel/test-http-timeout.js index 817bfe7a3c3b..af393fc0b7b5 100644 --- a/test/parallel/test-http-timeout.js +++ b/test/http/parallel/test-http-timeout.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const http = require('http'); diff --git a/test/parallel/test-http-unix-socket.js b/test/http/parallel/test-http-unix-socket.js similarity index 98% rename from test/parallel/test-http-unix-socket.js rename to test/http/parallel/test-http-unix-socket.js index 6d5897cacbec..3cd3095f2ece 100644 --- a/test/parallel/test-http-unix-socket.js +++ b/test/http/parallel/test-http-unix-socket.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-upgrade-advertise.js b/test/http/parallel/test-http-upgrade-advertise.js similarity index 96% rename from test/parallel/test-http-upgrade-advertise.js rename to test/http/parallel/test-http-upgrade-advertise.js index 99a3e8fd3530..30180b8a9418 100644 --- a/test/parallel/test-http-upgrade-advertise.js +++ b/test/http/parallel/test-http-upgrade-advertise.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-upgrade-agent.js b/test/http/parallel/test-http-upgrade-agent.js similarity index 98% rename from test/parallel/test-http-upgrade-agent.js rename to test/http/parallel/test-http-upgrade-agent.js index 5c840eeb5328..ec4c831a4762 100644 --- a/test/parallel/test-http-upgrade-agent.js +++ b/test/http/parallel/test-http-upgrade-agent.js @@ -24,7 +24,7 @@ // the HTTP client. This test uses a raw TCP server to better control server // behavior. -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-upgrade-client.js b/test/http/parallel/test-http-upgrade-client.js similarity index 98% rename from test/parallel/test-http-upgrade-client.js rename to test/http/parallel/test-http-upgrade-client.js index 3c56e5959fbd..59be0367ff31 100644 --- a/test/parallel/test-http-upgrade-client.js +++ b/test/http/parallel/test-http-upgrade-client.js @@ -24,7 +24,7 @@ // the HTTP client. This test uses a raw TCP server to better control server // behavior. -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-upgrade-client2.js b/test/http/parallel/test-http-upgrade-client2.js similarity index 98% rename from test/parallel/test-http-upgrade-client2.js rename to test/http/parallel/test-http-upgrade-client2.js index 221017819c56..485a0301813f 100644 --- a/test/parallel/test-http-upgrade-client2.js +++ b/test/http/parallel/test-http-upgrade-client2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const CRLF = '\r\n'; diff --git a/test/parallel/test-http-upgrade-reconsume-stream.js b/test/http/parallel/test-http-upgrade-reconsume-stream.js similarity index 94% rename from test/parallel/test-http-upgrade-reconsume-stream.js rename to test/http/parallel/test-http-upgrade-reconsume-stream.js index e712ea647b3a..5c7966ccc42a 100644 --- a/test/parallel/test-http-upgrade-reconsume-stream.js +++ b/test/http/parallel/test-http-upgrade-reconsume-stream.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-upgrade-server.js b/test/http/parallel/test-http-upgrade-server.js similarity index 99% rename from test/parallel/test-http-upgrade-server.js rename to test/http/parallel/test-http-upgrade-server.js index 71a075831603..f55d89102c34 100644 --- a/test/parallel/test-http-upgrade-server.js +++ b/test/http/parallel/test-http-upgrade-server.js @@ -21,7 +21,7 @@ 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const util = require('util'); diff --git a/test/parallel/test-http-upgrade-server2.js b/test/http/parallel/test-http-upgrade-server2.js similarity index 98% rename from test/parallel/test-http-upgrade-server2.js rename to test/http/parallel/test-http-upgrade-server2.js index 209ea1f4bc7c..091de96ee30f 100644 --- a/test/parallel/test-http-upgrade-server2.js +++ b/test/http/parallel/test-http-upgrade-server2.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/parallel/test-http-url.parse-auth-with-header-in-request.js b/test/http/parallel/test-http-url.parse-auth-with-header-in-request.js similarity index 98% rename from test/parallel/test-http-url.parse-auth-with-header-in-request.js rename to test/http/parallel/test-http-url.parse-auth-with-header-in-request.js index b91dc1438310..0f6b74dabeeb 100644 --- a/test/parallel/test-http-url.parse-auth-with-header-in-request.js +++ b/test/http/parallel/test-http-url.parse-auth-with-header-in-request.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-auth.js b/test/http/parallel/test-http-url.parse-auth.js similarity index 98% rename from test/parallel/test-http-url.parse-auth.js rename to test/http/parallel/test-http-url.parse-auth.js index d166120ac293..bd697f28eeb3 100644 --- a/test/parallel/test-http-url.parse-auth.js +++ b/test/http/parallel/test-http-url.parse-auth.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-basic.js b/test/http/parallel/test-http-url.parse-basic.js similarity index 98% rename from test/parallel/test-http-url.parse-basic.js rename to test/http/parallel/test-http-url.parse-basic.js index 0aa7616d05b2..dfb6e8cf030c 100644 --- a/test/parallel/test-http-url.parse-basic.js +++ b/test/http/parallel/test-http-url.parse-basic.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-https.request.js b/test/http/parallel/test-http-url.parse-https.request.js similarity index 98% rename from test/parallel/test-http-url.parse-https.request.js rename to test/http/parallel/test-http-url.parse-https.request.js index b644e7530ff8..a404563b9c7d 100644 --- a/test/parallel/test-http-url.parse-https.request.js +++ b/test/http/parallel/test-http-url.parse-https.request.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http-url.parse-only-support-http-https-protocol.js b/test/http/parallel/test-http-url.parse-only-support-http-https-protocol.js similarity index 99% rename from test/parallel/test-http-url.parse-only-support-http-https-protocol.js rename to test/http/parallel/test-http-url.parse-only-support-http-https-protocol.js index 903b4ba598ba..799a41ee17da 100644 --- a/test/parallel/test-http-url.parse-only-support-http-https-protocol.js +++ b/test/http/parallel/test-http-url.parse-only-support-http-https-protocol.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-path.js b/test/http/parallel/test-http-url.parse-path.js similarity index 98% rename from test/parallel/test-http-url.parse-path.js rename to test/http/parallel/test-http-url.parse-path.js index ab2e550f558c..5aa6abe49d1c 100644 --- a/test/parallel/test-http-url.parse-path.js +++ b/test/http/parallel/test-http-url.parse-path.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-post.js b/test/http/parallel/test-http-url.parse-post.js similarity index 98% rename from test/parallel/test-http-url.parse-post.js rename to test/http/parallel/test-http-url.parse-post.js index dab2e8f97dda..d3db44ecbe54 100644 --- a/test/parallel/test-http-url.parse-post.js +++ b/test/http/parallel/test-http-url.parse-post.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-url.parse-search.js b/test/http/parallel/test-http-url.parse-search.js similarity index 98% rename from test/parallel/test-http-url.parse-search.js rename to test/http/parallel/test-http-url.parse-search.js index 53d06556c318..1eed35d11a66 100644 --- a/test/parallel/test-http-url.parse-search.js +++ b/test/http/parallel/test-http-url.parse-search.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-http-wget.js b/test/http/parallel/test-http-wget.js similarity index 98% rename from test/parallel/test-http-wget.js rename to test/http/parallel/test-http-wget.js index ef06deefdf8a..149f5f97ee73 100644 --- a/test/parallel/test-http-wget.js +++ b/test/http/parallel/test-http-wget.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const net = require('net'); const http = require('http'); diff --git a/test/parallel/test-http-write-callbacks.js b/test/http/parallel/test-http-write-callbacks.js similarity index 99% rename from test/parallel/test-http-write-callbacks.js rename to test/http/parallel/test-http-write-callbacks.js index 440807a2df7c..056a0975dade 100644 --- a/test/parallel/test-http-write-callbacks.js +++ b/test/http/parallel/test-http-write-callbacks.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-write-empty-string.js b/test/http/parallel/test-http-write-empty-string.js similarity index 97% rename from test/parallel/test-http-write-empty-string.js rename to test/http/parallel/test-http-write-empty-string.js index 35a7aca61b40..3dd6bb2c563a 100644 --- a/test/parallel/test-http-write-empty-string.js +++ b/test/http/parallel/test-http-write-empty-string.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-write-head.js b/test/http/parallel/test-http-write-head.js similarity index 98% rename from test/parallel/test-http-write-head.js rename to test/http/parallel/test-http-write-head.js index 70ad5935a926..5610b42894fc 100644 --- a/test/parallel/test-http-write-head.js +++ b/test/http/parallel/test-http-write-head.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http-zero-length-write.js b/test/http/parallel/test-http-zero-length-write.js similarity index 99% rename from test/parallel/test-http-zero-length-write.js rename to test/http/parallel/test-http-zero-length-write.js index 35a1b616d704..013915d7d046 100644 --- a/test/parallel/test-http-zero-length-write.js +++ b/test/http/parallel/test-http-zero-length-write.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/parallel/test-http.js b/test/http/parallel/test-http.js similarity index 99% rename from test/parallel/test-http.js rename to test/http/parallel/test-http.js index d9fa581f3b55..370f550894e4 100644 --- a/test/parallel/test-http.js +++ b/test/http/parallel/test-http.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const url = require('url'); diff --git a/test/parallel/test-https-agent-constructor.js b/test/http/parallel/test-https-agent-constructor.js similarity index 85% rename from test/parallel/test-https-agent-constructor.js rename to test/http/parallel/test-https-agent-constructor.js index 29bb9eaa9806..cc63b1d44a34 100644 --- a/test/parallel/test-https-agent-constructor.js +++ b/test/http/parallel/test-https-agent-constructor.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-create-connection.js b/test/http/parallel/test-https-agent-create-connection.js similarity index 98% rename from test/parallel/test-https-agent-create-connection.js rename to test/http/parallel/test-https-agent-create-connection.js index 267030232dcf..b6bfa6adc42f 100644 --- a/test/parallel/test-https-agent-create-connection.js +++ b/test/http/parallel/test-https-agent-create-connection.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-disable-session-reuse.js b/test/http/parallel/test-https-agent-disable-session-reuse.js similarity index 96% rename from test/parallel/test-https-agent-disable-session-reuse.js rename to test/http/parallel/test-https-agent-disable-session-reuse.js index 4f92547e999a..a687c6065819 100644 --- a/test/parallel/test-https-agent-disable-session-reuse.js +++ b/test/http/parallel/test-https-agent-disable-session-reuse.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-getname.js b/test/http/parallel/test-https-agent-getname.js similarity index 93% rename from test/parallel/test-https-agent-getname.js rename to test/http/parallel/test-https-agent-getname.js index 0986f8472de8..1fe442fdecd5 100644 --- a/test/parallel/test-https-agent-getname.js +++ b/test/http/parallel/test-https-agent-getname.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-secure-protocol.js b/test/http/parallel/test-https-agent-secure-protocol.js similarity index 97% rename from test/parallel/test-https-agent-secure-protocol.js rename to test/http/parallel/test-https-agent-secure-protocol.js index 4839dd7c460d..0a60ef76ab4a 100644 --- a/test/parallel/test-https-agent-secure-protocol.js +++ b/test/http/parallel/test-https-agent-secure-protocol.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-servername.js b/test/http/parallel/test-https-agent-servername.js similarity index 95% rename from test/parallel/test-https-agent-servername.js rename to test/http/parallel/test-https-agent-servername.js index 625fa45c7c1d..d4cdce707365 100644 --- a/test/parallel/test-https-agent-servername.js +++ b/test/http/parallel/test-https-agent-servername.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-session-eviction.js b/test/http/parallel/test-https-agent-session-eviction.js similarity index 97% rename from test/parallel/test-https-agent-session-eviction.js rename to test/http/parallel/test-https-agent-session-eviction.js index 567ed809e646..2f4bbba6e5e0 100644 --- a/test/parallel/test-https-agent-session-eviction.js +++ b/test/http/parallel/test-https-agent-session-eviction.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-session-reuse.js b/test/http/parallel/test-https-agent-session-reuse.js similarity index 98% rename from test/parallel/test-https-agent-session-reuse.js rename to test/http/parallel/test-https-agent-session-reuse.js index f850144eaab1..07167d98b425 100644 --- a/test/parallel/test-https-agent-session-reuse.js +++ b/test/http/parallel/test-https-agent-session-reuse.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); if (!common.hasCrypto) diff --git a/test/parallel/test-https-agent-sni.js b/test/http/parallel/test-https-agent-sni.js similarity index 96% rename from test/parallel/test-https-agent-sni.js rename to test/http/parallel/test-https-agent-sni.js index a06ce439fa43..3b4739eb5c7d 100644 --- a/test/parallel/test-https-agent-sni.js +++ b/test/http/parallel/test-https-agent-sni.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent-sockets-leak.js b/test/http/parallel/test-https-agent-sockets-leak.js similarity index 97% rename from test/parallel/test-https-agent-sockets-leak.js rename to test/http/parallel/test-https-agent-sockets-leak.js index 3772fd3a1068..9042e49d58ec 100644 --- a/test/parallel/test-https-agent-sockets-leak.js +++ b/test/http/parallel/test-https-agent-sockets-leak.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-agent.js b/test/http/parallel/test-https-agent.js similarity index 98% rename from test/parallel/test-https-agent.js rename to test/http/parallel/test-https-agent.js index e2e71cd31a76..2c6e01ce24c6 100644 --- a/test/parallel/test-https-agent.js +++ b/test/http/parallel/test-https-agent.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-argument-of-creating.js b/test/http/parallel/test-https-argument-of-creating.js similarity index 96% rename from test/parallel/test-https-argument-of-creating.js rename to test/http/parallel/test-https-argument-of-creating.js index 5a4150eb1cca..d4e8ae1adc41 100644 --- a/test/parallel/test-https-argument-of-creating.js +++ b/test/http/parallel/test-https-argument-of-creating.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-byteswritten.js b/test/http/parallel/test-https-byteswritten.js similarity index 97% rename from test/parallel/test-https-byteswritten.js rename to test/http/parallel/test-https-byteswritten.js index 8f4d761c02b7..d2cb7f883877 100644 --- a/test/parallel/test-https-byteswritten.js +++ b/test/http/parallel/test-https-byteswritten.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-client-checkServerIdentity.js b/test/http/parallel/test-https-client-checkServerIdentity.js similarity index 98% rename from test/parallel/test-https-client-checkServerIdentity.js rename to test/http/parallel/test-https-client-checkServerIdentity.js index 9842fc1f357e..0367e379462d 100644 --- a/test/parallel/test-https-client-checkServerIdentity.js +++ b/test/http/parallel/test-https-client-checkServerIdentity.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-client-get-url.js b/test/http/parallel/test-https-client-get-url.js similarity index 98% rename from test/parallel/test-https-client-get-url.js rename to test/http/parallel/test-https-client-get-url.js index 705e779aacb7..2c2d68a82d24 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/http/parallel/test-https-client-get-url.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-client-reject.js b/test/http/parallel/test-https-client-reject.js similarity index 98% rename from test/parallel/test-https-client-reject.js rename to test/http/parallel/test-https-client-reject.js index 82a7851e4e11..fb371881ff1f 100644 --- a/test/parallel/test-https-client-reject.js +++ b/test/http/parallel/test-https-client-reject.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-client-resume.js b/test/http/parallel/test-https-client-resume.js similarity index 98% rename from test/parallel/test-https-client-resume.js rename to test/http/parallel/test-https-client-resume.js index d61d91964b0e..3c231e40e864 100644 --- a/test/parallel/test-https-client-resume.js +++ b/test/http/parallel/test-https-client-resume.js @@ -23,7 +23,7 @@ // Create an ssl server. First connection, validate that not resume. // Cache session and close connection. Use session on second connection. // ASSERT resumption. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-close.js b/test/http/parallel/test-https-close.js similarity index 96% rename from test/parallel/test-https-close.js rename to test/http/parallel/test-https-close.js index 1590f3cb5b38..c9ee2425a05e 100644 --- a/test/parallel/test-https-close.js +++ b/test/http/parallel/test-https-close.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-connect-address-family.js b/test/http/parallel/test-https-connect-address-family.js similarity index 96% rename from test/parallel/test-https-connect-address-family.js rename to test/http/parallel/test-https-connect-address-family.js index fa9baa528efa..e48859905272 100644 --- a/test/parallel/test-https-connect-address-family.js +++ b/test/http/parallel/test-https-connect-address-family.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-connecting-to-http.js b/test/http/parallel/test-https-connecting-to-http.js similarity index 97% rename from test/parallel/test-https-connecting-to-http.js rename to test/http/parallel/test-https-connecting-to-http.js index 195ad38ed44a..076d226b6222 100644 --- a/test/parallel/test-https-connecting-to-http.js +++ b/test/http/parallel/test-https-connecting-to-http.js @@ -22,7 +22,7 @@ 'use strict'; // This tests the situation where you try to connect a https client // to an http server. You should get an error and exit. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-drain.js b/test/http/parallel/test-https-drain.js similarity index 98% rename from test/parallel/test-https-drain.js rename to test/http/parallel/test-https-drain.js index f9316a261b98..5a7c42228ced 100644 --- a/test/parallel/test-https-drain.js +++ b/test/http/parallel/test-https-drain.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-eof-for-eom.js b/test/http/parallel/test-https-eof-for-eom.js similarity index 98% rename from test/parallel/test-https-eof-for-eom.js rename to test/http/parallel/test-https-eof-for-eom.js index 3c724fe6342d..cef9d61013c9 100644 --- a/test/parallel/test-https-eof-for-eom.js +++ b/test/http/parallel/test-https-eof-for-eom.js @@ -28,7 +28,7 @@ // This test is to be sure that the https client is handling this case // correctly. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-foafssl.js b/test/http/parallel/test-https-foafssl.js similarity index 98% rename from test/parallel/test-https-foafssl.js rename to test/http/parallel/test-https-foafssl.js index d8beefc22b25..f2cf2b27badb 100644 --- a/test/parallel/test-https-foafssl.js +++ b/test/http/parallel/test-https-foafssl.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-host-headers.js b/test/http/parallel/test-https-host-headers.js similarity index 98% rename from test/parallel/test-https-host-headers.js rename to test/http/parallel/test-https-host-headers.js index 1181d300bf29..2d07ab6da942 100644 --- a/test/parallel/test-https-host-headers.js +++ b/test/http/parallel/test-https-host-headers.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-localaddress-bind-error.js b/test/http/parallel/test-https-localaddress-bind-error.js similarity index 98% rename from test/parallel/test-https-localaddress-bind-error.js rename to test/http/parallel/test-https-localaddress-bind-error.js index a22db1e9e615..5e73c66885c2 100644 --- a/test/parallel/test-https-localaddress-bind-error.js +++ b/test/http/parallel/test-https-localaddress-bind-error.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-localaddress.js b/test/http/parallel/test-https-localaddress.js similarity index 98% rename from test/parallel/test-https-localaddress.js rename to test/http/parallel/test-https-localaddress.js index 1c5669be30c1..de336de70523 100644 --- a/test/parallel/test-https-localaddress.js +++ b/test/http/parallel/test-https-localaddress.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-options-boolean-check.js b/test/http/parallel/test-https-options-boolean-check.js similarity index 98% rename from test/parallel/test-https-options-boolean-check.js rename to test/http/parallel/test-https-options-boolean-check.js index eae319988e7c..7adfdbe7f32c 100644 --- a/test/parallel/test-https-options-boolean-check.js +++ b/test/http/parallel/test-https-options-boolean-check.js @@ -1,7 +1,7 @@ 'use strict'; -const common = require('../common'); -const fixtures = require('../common/fixtures'); +const common = require('../../common'); +const fixtures = require('../../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-pfx.js b/test/http/parallel/test-https-pfx.js similarity index 98% rename from test/parallel/test-https-pfx.js rename to test/http/parallel/test-https-pfx.js index d7561f742462..3adc3071635e 100644 --- a/test/parallel/test-https-pfx.js +++ b/test/http/parallel/test-https-pfx.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-req-split.js b/test/http/parallel/test-https-req-split.js similarity index 98% rename from test/parallel/test-https-req-split.js rename to test/http/parallel/test-https-req-split.js index d0306cb714fb..8126c45403a1 100644 --- a/test/parallel/test-https-req-split.js +++ b/test/http/parallel/test-https-req-split.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-resume-after-renew.js b/test/http/parallel/test-https-resume-after-renew.js similarity index 96% rename from test/parallel/test-https-resume-after-renew.js rename to test/http/parallel/test-https-resume-after-renew.js index eb3192303713..1283745c2f9d 100644 --- a/test/parallel/test-https-resume-after-renew.js +++ b/test/http/parallel/test-https-resume-after-renew.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-server-keep-alive-timeout.js b/test/http/parallel/test-https-server-keep-alive-timeout.js similarity index 98% rename from test/parallel/test-https-server-keep-alive-timeout.js rename to test/http/parallel/test-https-server-keep-alive-timeout.js index ae6b43126842..afff0f490fbd 100644 --- a/test/parallel/test-https-server-keep-alive-timeout.js +++ b/test/http/parallel/test-https-server-keep-alive-timeout.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-set-timeout-server.js b/test/http/parallel/test-https-set-timeout-server.js similarity index 99% rename from test/parallel/test-https-set-timeout-server.js rename to test/http/parallel/test-https-set-timeout-server.js index b5cc8a6f5a26..3f73160e0b70 100644 --- a/test/parallel/test-https-set-timeout-server.js +++ b/test/http/parallel/test-https-set-timeout-server.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-simple.js b/test/http/parallel/test-https-simple.js similarity index 98% rename from test/parallel/test-https-simple.js rename to test/http/parallel/test-https-simple.js index b79d1b943f35..63a166824955 100644 --- a/test/parallel/test-https-simple.js +++ b/test/http/parallel/test-https-simple.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-socket-options.js b/test/http/parallel/test-https-socket-options.js similarity index 98% rename from test/parallel/test-https-socket-options.js rename to test/http/parallel/test-https-socket-options.js index 2a6fc8f84f78..7e9f61ed33a4 100644 --- a/test/parallel/test-https-socket-options.js +++ b/test/http/parallel/test-https-socket-options.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-strict.js b/test/http/parallel/test-https-strict.js similarity index 99% rename from test/parallel/test-https-strict.js rename to test/http/parallel/test-https-strict.js index 51d209b4ed6d..db865da8d78a 100644 --- a/test/parallel/test-https-strict.js +++ b/test/http/parallel/test-https-strict.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-timeout-server-2.js b/test/http/parallel/test-https-timeout-server-2.js similarity index 97% rename from test/parallel/test-https-timeout-server-2.js rename to test/http/parallel/test-https-timeout-server-2.js index 269c06569f6b..d7f17687b59d 100644 --- a/test/parallel/test-https-timeout-server-2.js +++ b/test/http/parallel/test-https-timeout-server-2.js @@ -21,7 +21,7 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-timeout-server.js b/test/http/parallel/test-https-timeout-server.js similarity index 98% rename from test/parallel/test-https-timeout-server.js rename to test/http/parallel/test-https-timeout-server.js index 17218ba8055f..ca0d473d1cd3 100644 --- a/test/parallel/test-https-timeout-server.js +++ b/test/http/parallel/test-https-timeout-server.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-timeout.js b/test/http/parallel/test-https-timeout.js similarity index 98% rename from test/parallel/test-https-timeout.js rename to test/http/parallel/test-https-timeout.js index ad1fcb3ed232..28d425c042c0 100644 --- a/test/parallel/test-https-timeout.js +++ b/test/http/parallel/test-https-timeout.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-truncate.js b/test/http/parallel/test-https-truncate.js similarity index 98% rename from test/parallel/test-https-truncate.js rename to test/http/parallel/test-https-truncate.js index dcefcca104ef..65e93e1b6519 100644 --- a/test/parallel/test-https-truncate.js +++ b/test/http/parallel/test-https-truncate.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-https-unix-socket-self-signed.js b/test/http/parallel/test-https-unix-socket-self-signed.js similarity index 93% rename from test/parallel/test-https-unix-socket-self-signed.js rename to test/http/parallel/test-https-unix-socket-self-signed.js index 6653cdd5f8de..23f231707f4f 100644 --- a/test/parallel/test-https-unix-socket-self-signed.js +++ b/test/http/parallel/test-https-unix-socket-self-signed.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/http/parallel/testcfg.py b/test/http/parallel/testcfg.py new file mode 100644 index 000000000000..8b610b50b1d7 --- /dev/null +++ b/test/http/parallel/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.ParallelTestConfiguration(context, root, 'parallel') diff --git a/test/pummel/test-http-many-keep-alive-connections.js b/test/http/pummel/test-http-many-keep-alive-connections.js similarity index 98% rename from test/pummel/test-http-many-keep-alive-connections.js rename to test/http/pummel/test-http-many-keep-alive-connections.js index cb9f99468449..71ffc305ea66 100644 --- a/test/pummel/test-http-many-keep-alive-connections.js +++ b/test/http/pummel/test-http-many-keep-alive-connections.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/pummel/test-http-upload-timeout.js b/test/http/pummel/test-http-upload-timeout.js similarity index 98% rename from test/pummel/test-http-upload-timeout.js rename to test/http/pummel/test-http-upload-timeout.js index 2c1cbf61988e..78ffb6d65249 100644 --- a/test/pummel/test-http-upload-timeout.js +++ b/test/http/pummel/test-http-upload-timeout.js @@ -23,7 +23,7 @@ // This tests setTimeout() by having multiple clients connecting and sending // data in random intervals. Clients are also randomly disconnecting until there // are no more clients left. If no false timeout occurs, this test has passed. -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer(); let connections = 0; diff --git a/test/http/pummel/testcfg.py b/test/http/pummel/testcfg.py new file mode 100644 index 000000000000..c91fe39dce27 --- /dev/null +++ b/test/http/pummel/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.SimpleTestConfiguration(context, root, 'pummel') diff --git a/test/sequential/test-http-regr-gh-2928.js b/test/http/sequential/test-http-regr-gh-2928.js similarity index 97% rename from test/sequential/test-http-regr-gh-2928.js rename to test/http/sequential/test-http-regr-gh-2928.js index 55e3a93bc98e..36da9d7c1762 100644 --- a/test/sequential/test-http-regr-gh-2928.js +++ b/test/http/sequential/test-http-regr-gh-2928.js @@ -2,7 +2,7 @@ // execute without issues in Node.js 4.1.1 and up. 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const httpCommon = require('_http_common'); const HTTPParser = process.binding('http_parser').HTTPParser; diff --git a/test/sequential/test-http-server-consumed-timeout.js b/test/http/sequential/test-http-server-consumed-timeout.js similarity index 94% rename from test/sequential/test-http-server-consumed-timeout.js rename to test/http/sequential/test-http-server-consumed-timeout.js index e6157a0a1d92..6dec1cffe466 100644 --- a/test/sequential/test-http-server-consumed-timeout.js +++ b/test/http/sequential/test-http-server-consumed-timeout.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const http = require('http'); const server = http.createServer((req, res) => { diff --git a/test/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js b/test/http/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js similarity index 97% rename from test/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js rename to test/http/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js index 453831ecba88..02eb523c6000 100644 --- a/test/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js +++ b/test/http/sequential/test-http-server-keep-alive-timeout-slow-client-headers.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); const net = require('net'); diff --git a/test/sequential/test-http-server-keep-alive-timeout-slow-server.js b/test/http/sequential/test-http-server-keep-alive-timeout-slow-server.js similarity index 96% rename from test/sequential/test-http-server-keep-alive-timeout-slow-server.js rename to test/http/sequential/test-http-server-keep-alive-timeout-slow-server.js index 1543c1415fa5..6e7dab5e0bff 100644 --- a/test/sequential/test-http-server-keep-alive-timeout-slow-server.js +++ b/test/http/sequential/test-http-server-keep-alive-timeout-slow-server.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const http = require('http'); diff --git a/test/http/sequential/testcfg.py b/test/http/sequential/testcfg.py new file mode 100644 index 000000000000..b1fce1810017 --- /dev/null +++ b/test/http/sequential/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.SimpleTestConfiguration(context, root, 'sequential') diff --git a/test/parallel/test-http2-binding.js b/test/http2/parallel/test-http2-binding.js similarity index 99% rename from test/parallel/test-http2-binding.js rename to test/http2/parallel/test-http2-binding.js index 919ee5908fac..560de9a8260f 100644 --- a/test/parallel/test-http2-binding.js +++ b/test/http2/parallel/test-http2-binding.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-data-end.js b/test/http2/parallel/test-http2-client-data-end.js similarity index 98% rename from test/parallel/test-http2-client-data-end.js rename to test/http2/parallel/test-http2-client-data-end.js index 8c50389f3b85..155f63303566 100644 --- a/test/parallel/test-http2-client-data-end.js +++ b/test/http2/parallel/test-http2-client-data-end.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-destroy-before-connect.js b/test/http2/parallel/test-http2-client-destroy-before-connect.js similarity index 93% rename from test/parallel/test-http2-client-destroy-before-connect.js rename to test/http2/parallel/test-http2-client-destroy-before-connect.js index 3c99b8d66150..a96592b6eb32 100644 --- a/test/parallel/test-http2-client-destroy-before-connect.js +++ b/test/http2/parallel/test-http2-client-destroy-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-client-destroy-before-request.js b/test/http2/parallel/test-http2-client-destroy-before-request.js similarity index 94% rename from test/parallel/test-http2-client-destroy-before-request.js rename to test/http2/parallel/test-http2-client-destroy-before-request.js index b8510f6a445e..da39ade32d8b 100644 --- a/test/parallel/test-http2-client-destroy-before-request.js +++ b/test/http2/parallel/test-http2-client-destroy-before-request.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-destroy-goaway.js b/test/http2/parallel/test-http2-client-destroy-goaway.js similarity index 93% rename from test/parallel/test-http2-client-destroy-goaway.js rename to test/http2/parallel/test-http2-client-destroy-goaway.js index c393cfc0706e..f9932e638557 100644 --- a/test/parallel/test-http2-client-destroy-goaway.js +++ b/test/http2/parallel/test-http2-client-destroy-goaway.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-client-destroy.js b/test/http2/parallel/test-http2-client-destroy.js similarity index 97% rename from test/parallel/test-http2-client-destroy.js rename to test/http2/parallel/test-http2-client-destroy.js index f10956603135..b598fca3320a 100644 --- a/test/parallel/test-http2-client-destroy.js +++ b/test/http2/parallel/test-http2-client-destroy.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-onconnect-errors.js b/test/http2/parallel/test-http2-client-onconnect-errors.js similarity index 98% rename from test/parallel/test-http2-client-onconnect-errors.js rename to test/http2/parallel/test-http2-client-onconnect-errors.js index 2e9f946194b0..bc6541bb9afb 100644 --- a/test/parallel/test-http2-client-onconnect-errors.js +++ b/test/http2/parallel/test-http2-client-onconnect-errors.js @@ -6,7 +6,7 @@ const { Http2Session, nghttp2ErrorString } = process.binding('http2'); -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-client-priority-before-connect.js b/test/http2/parallel/test-http2-client-priority-before-connect.js similarity index 95% rename from test/parallel/test-http2-client-priority-before-connect.js rename to test/http2/parallel/test-http2-client-priority-before-connect.js index 7fd81c8b9332..dd9292cd6764 100644 --- a/test/parallel/test-http2-client-priority-before-connect.js +++ b/test/http2/parallel/test-http2-client-priority-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-client-promisify-connect.js b/test/http2/parallel/test-http2-client-promisify-connect.js similarity index 95% rename from test/parallel/test-http2-client-promisify-connect.js rename to test/http2/parallel/test-http2-client-promisify-connect.js index 5b6dccad6a22..33273b203e9b 100644 --- a/test/parallel/test-http2-client-promisify-connect.js +++ b/test/http2/parallel/test-http2-client-promisify-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-request-options-errors.js b/test/http2/parallel/test-http2-client-request-options-errors.js similarity index 97% rename from test/parallel/test-http2-client-request-options-errors.js rename to test/http2/parallel/test-http2-client-request-options-errors.js index 92dad5c84304..e9f5f16cd884 100644 --- a/test/parallel/test-http2-client-request-options-errors.js +++ b/test/http2/parallel/test-http2-client-request-options-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-rststream-before-connect.js b/test/http2/parallel/test-http2-client-rststream-before-connect.js similarity index 95% rename from test/parallel/test-http2-client-rststream-before-connect.js rename to test/http2/parallel/test-http2-client-rststream-before-connect.js index 1a4aa938da6a..4275f538685b 100644 --- a/test/parallel/test-http2-client-rststream-before-connect.js +++ b/test/http2/parallel/test-http2-client-rststream-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-set-priority.js b/test/http2/parallel/test-http2-client-set-priority.js similarity index 96% rename from test/parallel/test-http2-client-set-priority.js rename to test/http2/parallel/test-http2-client-set-priority.js index 08c799a6e1ff..ad05653c8f4b 100644 --- a/test/parallel/test-http2-client-set-priority.js +++ b/test/http2/parallel/test-http2-client-set-priority.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-settings-before-connect.js b/test/http2/parallel/test-http2-client-settings-before-connect.js similarity index 97% rename from test/parallel/test-http2-client-settings-before-connect.js rename to test/http2/parallel/test-http2-client-settings-before-connect.js index 2ebb0654a313..5939fa739e72 100644 --- a/test/parallel/test-http2-client-settings-before-connect.js +++ b/test/http2/parallel/test-http2-client-settings-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-shutdown-before-connect.js b/test/http2/parallel/test-http2-client-shutdown-before-connect.js similarity index 92% rename from test/parallel/test-http2-client-shutdown-before-connect.js rename to test/http2/parallel/test-http2-client-shutdown-before-connect.js index 316a41d0f79d..1b9ca3731a52 100644 --- a/test/parallel/test-http2-client-shutdown-before-connect.js +++ b/test/http2/parallel/test-http2-client-shutdown-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-client-socket-destroy.js b/test/http2/parallel/test-http2-client-socket-destroy.js similarity index 96% rename from test/parallel/test-http2-client-socket-destroy.js rename to test/http2/parallel/test-http2-client-socket-destroy.js index 9d2fdd3b4486..fb38a83c7920 100644 --- a/test/parallel/test-http2-client-socket-destroy.js +++ b/test/http2/parallel/test-http2-client-socket-destroy.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-client-stream-destroy-before-connect.js b/test/http2/parallel/test-http2-client-stream-destroy-before-connect.js similarity index 97% rename from test/parallel/test-http2-client-stream-destroy-before-connect.js rename to test/http2/parallel/test-http2-client-stream-destroy-before-connect.js index 05ba63f0b54d..6467ee605a3a 100644 --- a/test/parallel/test-http2-client-stream-destroy-before-connect.js +++ b/test/http2/parallel/test-http2-client-stream-destroy-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-unescaped-path.js b/test/http2/parallel/test-http2-client-unescaped-path.js similarity index 95% rename from test/parallel/test-http2-client-unescaped-path.js rename to test/http2/parallel/test-http2-client-unescaped-path.js index 645fb3316388..50d7534f6ab8 100644 --- a/test/parallel/test-http2-client-unescaped-path.js +++ b/test/http2/parallel/test-http2-client-unescaped-path.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-client-upload.js b/test/http2/parallel/test-http2-client-upload.js similarity index 97% rename from test/parallel/test-http2-client-upload.js rename to test/http2/parallel/test-http2-client-upload.js index cee86e3fc653..30f9f54a93e4 100644 --- a/test/parallel/test-http2-client-upload.js +++ b/test/http2/parallel/test-http2-client-upload.js @@ -3,7 +3,7 @@ // Verifies that uploading data from a client works -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-client-write-before-connect.js b/test/http2/parallel/test-http2-client-write-before-connect.js similarity index 96% rename from test/parallel/test-http2-client-write-before-connect.js rename to test/http2/parallel/test-http2-client-write-before-connect.js index ed46840266a5..6326dd91bf02 100644 --- a/test/parallel/test-http2-client-write-before-connect.js +++ b/test/http2/parallel/test-http2-client-write-before-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-errors.js b/test/http2/parallel/test-http2-compat-errors.js similarity index 97% rename from test/parallel/test-http2-compat-errors.js rename to test/http2/parallel/test-http2-compat-errors.js index dacb39c6dfe3..25364af20ad8 100644 --- a/test/parallel/test-http2-compat-errors.js +++ b/test/http2/parallel/test-http2-compat-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-expect-continue-check.js b/test/http2/parallel/test-http2-compat-expect-continue-check.js similarity index 98% rename from test/parallel/test-http2-compat-expect-continue-check.js rename to test/http2/parallel/test-http2-compat-expect-continue-check.js index a956697b5cb5..a732f777fda7 100644 --- a/test/parallel/test-http2-compat-expect-continue-check.js +++ b/test/http2/parallel/test-http2-compat-expect-continue-check.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-expect-continue.js b/test/http2/parallel/test-http2-compat-expect-continue.js similarity index 97% rename from test/parallel/test-http2-compat-expect-continue.js rename to test/http2/parallel/test-http2-compat-expect-continue.js index 291a70e0f273..3696e37cb6ea 100644 --- a/test/parallel/test-http2-compat-expect-continue.js +++ b/test/http2/parallel/test-http2-compat-expect-continue.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-expect-handling.js b/test/http2/parallel/test-http2-compat-expect-handling.js similarity index 96% rename from test/parallel/test-http2-compat-expect-handling.js rename to test/http2/parallel/test-http2-compat-expect-handling.js index 774d276b64e4..5a151eaa4264 100644 --- a/test/parallel/test-http2-compat-expect-handling.js +++ b/test/http2/parallel/test-http2-compat-expect-handling.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-method-connect.js b/test/http2/parallel/test-http2-compat-method-connect.js similarity index 96% rename from test/parallel/test-http2-compat-method-connect.js rename to test/http2/parallel/test-http2-compat-method-connect.js index 8e6202317aaf..6cc6aecee987 100644 --- a/test/parallel/test-http2-compat-method-connect.js +++ b/test/http2/parallel/test-http2-compat-method-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverrequest-end.js b/test/http2/parallel/test-http2-compat-serverrequest-end.js similarity index 96% rename from test/parallel/test-http2-compat-serverrequest-end.js rename to test/http2/parallel/test-http2-compat-serverrequest-end.js index a84f73883d66..e612f6643a17 100644 --- a/test/parallel/test-http2-compat-serverrequest-end.js +++ b/test/http2/parallel/test-http2-compat-serverrequest-end.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-compat-serverrequest-headers.js b/test/http2/parallel/test-http2-compat-serverrequest-headers.js similarity index 97% rename from test/parallel/test-http2-compat-serverrequest-headers.js rename to test/http2/parallel/test-http2-compat-serverrequest-headers.js index 286a0e19c87c..a15fe6e0131b 100644 --- a/test/parallel/test-http2-compat-serverrequest-headers.js +++ b/test/http2/parallel/test-http2-compat-serverrequest-headers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverrequest-settimeout.js b/test/http2/parallel/test-http2-compat-serverrequest-settimeout.js similarity index 94% rename from test/parallel/test-http2-compat-serverrequest-settimeout.js rename to test/http2/parallel/test-http2-compat-serverrequest-settimeout.js index 6e02fe0cffb2..d68266b12602 100644 --- a/test/parallel/test-http2-compat-serverrequest-settimeout.js +++ b/test/http2/parallel/test-http2-compat-serverrequest-settimeout.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-compat-serverrequest-trailers.js b/test/http2/parallel/test-http2-compat-serverrequest-trailers.js similarity index 97% rename from test/parallel/test-http2-compat-serverrequest-trailers.js rename to test/http2/parallel/test-http2-compat-serverrequest-trailers.js index 7fa649fe7fa0..65be002b0ac1 100644 --- a/test/parallel/test-http2-compat-serverrequest-trailers.js +++ b/test/http2/parallel/test-http2-compat-serverrequest-trailers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverrequest.js b/test/http2/parallel/test-http2-compat-serverrequest.js similarity index 97% rename from test/parallel/test-http2-compat-serverrequest.js rename to test/http2/parallel/test-http2-compat-serverrequest.js index a6882c6a9bf1..460dd15447b4 100644 --- a/test/parallel/test-http2-compat-serverrequest.js +++ b/test/http2/parallel/test-http2-compat-serverrequest.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js b/test/http2/parallel/test-http2-compat-serverresponse-createpushresponse.js similarity index 98% rename from test/parallel/test-http2-compat-serverresponse-createpushresponse.js rename to test/http2/parallel/test-http2-compat-serverresponse-createpushresponse.js index 8c5ff3127432..a3dc38e1e147 100644 --- a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-createpushresponse.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-destroy.js b/test/http2/parallel/test-http2-compat-serverresponse-destroy.js similarity index 98% rename from test/parallel/test-http2-compat-serverresponse-destroy.js rename to test/http2/parallel/test-http2-compat-serverresponse-destroy.js index f2b3ae7cfefa..805de88c797c 100644 --- a/test/parallel/test-http2-compat-serverresponse-destroy.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-destroy.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-end.js b/test/http2/parallel/test-http2-compat-serverresponse-end.js similarity index 96% rename from test/parallel/test-http2-compat-serverresponse-end.js rename to test/http2/parallel/test-http2-compat-serverresponse-end.js index 6c07f6d83e62..4144e5f48539 100644 --- a/test/parallel/test-http2-compat-serverresponse-end.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-end.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const { mustCall, mustNotCall, hasCrypto, skip } = require('../common'); +const { mustCall, mustNotCall, hasCrypto, skip } = require('../../common'); if (!hasCrypto) skip('missing crypto'); const { strictEqual } = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-finished.js b/test/http2/parallel/test-http2-compat-serverresponse-finished.js similarity index 96% rename from test/parallel/test-http2-compat-serverresponse-finished.js rename to test/http2/parallel/test-http2-compat-serverresponse-finished.js index e54255f67cd2..103e5077933a 100644 --- a/test/parallel/test-http2-compat-serverresponse-finished.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-finished.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-flushheaders.js b/test/http2/parallel/test-http2-compat-serverresponse-flushheaders.js similarity index 97% rename from test/parallel/test-http2-compat-serverresponse-flushheaders.js rename to test/http2/parallel/test-http2-compat-serverresponse-flushheaders.js index f02732df87b0..301470809a9e 100644 --- a/test/parallel/test-http2-compat-serverresponse-flushheaders.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-flushheaders.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-headers.js b/test/http2/parallel/test-http2-compat-serverresponse-headers.js similarity index 99% rename from test/parallel/test-http2-compat-serverresponse-headers.js rename to test/http2/parallel/test-http2-compat-serverresponse-headers.js index 2cc82d4dd3c8..13b53106cce5 100644 --- a/test/parallel/test-http2-compat-serverresponse-headers.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-headers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-settimeout.js b/test/http2/parallel/test-http2-compat-serverresponse-settimeout.js similarity index 94% rename from test/parallel/test-http2-compat-serverresponse-settimeout.js rename to test/http2/parallel/test-http2-compat-serverresponse-settimeout.js index 66441d390ae9..ebfa38ec3bc2 100644 --- a/test/parallel/test-http2-compat-serverresponse-settimeout.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-settimeout.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-compat-serverresponse-statuscode.js b/test/http2/parallel/test-http2-compat-serverresponse-statuscode.js similarity index 98% rename from test/parallel/test-http2-compat-serverresponse-statuscode.js rename to test/http2/parallel/test-http2-compat-serverresponse-statuscode.js index ace05ddefe73..e4ea2632fdbd 100644 --- a/test/parallel/test-http2-compat-serverresponse-statuscode.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-statuscode.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js similarity index 97% rename from test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js rename to test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js index bec056d01381..3c1a72945df6 100644 --- a/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property.js similarity index 97% rename from test/parallel/test-http2-compat-serverresponse-statusmessage-property.js rename to test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property.js index 3b3ef6bdc2c4..58c8664338b0 100644 --- a/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage-property.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage.js b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage.js similarity index 97% rename from test/parallel/test-http2-compat-serverresponse-statusmessage.js rename to test/http2/parallel/test-http2-compat-serverresponse-statusmessage.js index 0c74a2c8f2e8..c7e31abeb709 100644 --- a/test/parallel/test-http2-compat-serverresponse-statusmessage.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-statusmessage.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-trailers.js b/test/http2/parallel/test-http2-compat-serverresponse-trailers.js similarity index 95% rename from test/parallel/test-http2-compat-serverresponse-trailers.js rename to test/http2/parallel/test-http2-compat-serverresponse-trailers.js index 17c2d7344251..78876aac7974 100644 --- a/test/parallel/test-http2-compat-serverresponse-trailers.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-trailers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-write-no-cb.js b/test/http2/parallel/test-http2-compat-serverresponse-write-no-cb.js similarity index 98% rename from test/parallel/test-http2-compat-serverresponse-write-no-cb.js rename to test/http2/parallel/test-http2-compat-serverresponse-write-no-cb.js index bc864af46df4..be52f35a06a2 100644 --- a/test/parallel/test-http2-compat-serverresponse-write-no-cb.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-write-no-cb.js @@ -4,7 +4,7 @@ const { mustCall, mustNotCall, expectsError, - hasCrypto, skip } = require('../common'); + hasCrypto, skip } = require('../../common'); if (!hasCrypto) skip('missing crypto'); const { throws } = require('assert'); diff --git a/test/parallel/test-http2-compat-serverresponse-writehead.js b/test/http2/parallel/test-http2-compat-serverresponse-writehead.js similarity index 97% rename from test/parallel/test-http2-compat-serverresponse-writehead.js rename to test/http2/parallel/test-http2-compat-serverresponse-writehead.js index 12de29834687..8e3c21f01f6c 100644 --- a/test/parallel/test-http2-compat-serverresponse-writehead.js +++ b/test/http2/parallel/test-http2-compat-serverresponse-writehead.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-connect-method.js b/test/http2/parallel/test-http2-connect-method.js similarity index 98% rename from test/parallel/test-http2-connect-method.js rename to test/http2/parallel/test-http2-connect-method.js index 3626c7f2e51a..43f797059fbf 100644 --- a/test/parallel/test-http2-connect-method.js +++ b/test/http2/parallel/test-http2-connect-method.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-connect.js b/test/http2/parallel/test-http2-connect.js similarity index 99% rename from test/parallel/test-http2-connect.js rename to test/http2/parallel/test-http2-connect.js index 60777dadeb8e..73c8b36c7b98 100644 --- a/test/parallel/test-http2-connect.js +++ b/test/http2/parallel/test-http2-connect.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const { mustCall, hasCrypto, skip, expectsError } = require('../common'); +const { mustCall, hasCrypto, skip, expectsError } = require('../../common'); if (!hasCrypto) skip('missing crypto'); const { doesNotThrow, throws } = require('assert'); diff --git a/test/parallel/test-http2-cookies.js b/test/http2/parallel/test-http2-cookies.js similarity index 97% rename from test/parallel/test-http2-cookies.js rename to test/http2/parallel/test-http2-cookies.js index 3e20a5749dd6..f799ea945e32 100644 --- a/test/parallel/test-http2-cookies.js +++ b/test/http2/parallel/test-http2-cookies.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-create-client-connect.js b/test/http2/parallel/test-http2-create-client-connect.js similarity index 98% rename from test/parallel/test-http2-create-client-connect.js rename to test/http2/parallel/test-http2-create-client-connect.js index 2c40d7c65367..5aedb871f238 100644 --- a/test/parallel/test-http2-create-client-connect.js +++ b/test/http2/parallel/test-http2-create-client-connect.js @@ -3,7 +3,7 @@ // Tests http2.connect() -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const fs = require('fs'); diff --git a/test/parallel/test-http2-create-client-secure-session.js b/test/http2/parallel/test-http2-create-client-secure-session.js similarity index 98% rename from test/parallel/test-http2-create-client-secure-session.js rename to test/http2/parallel/test-http2-create-client-secure-session.js index 6e0e2ca43da3..8727547f10b5 100644 --- a/test/parallel/test-http2-create-client-secure-session.js +++ b/test/http2/parallel/test-http2-create-client-secure-session.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-create-client-session.js b/test/http2/parallel/test-http2-create-client-session.js similarity index 97% rename from test/parallel/test-http2-create-client-session.js rename to test/http2/parallel/test-http2-create-client-session.js index 22ab368f7bc5..1417df29af21 100644 --- a/test/parallel/test-http2-create-client-session.js +++ b/test/http2/parallel/test-http2-create-client-session.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-createsecureserver-nooptions.js b/test/http2/parallel/test-http2-createsecureserver-nooptions.js similarity index 95% rename from test/parallel/test-http2-createsecureserver-nooptions.js rename to test/http2/parallel/test-http2-createsecureserver-nooptions.js index 5a9849f9e11a..3c1d3949a6eb 100644 --- a/test/parallel/test-http2-createsecureserver-nooptions.js +++ b/test/http2/parallel/test-http2-createsecureserver-nooptions.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-createwritereq.js b/test/http2/parallel/test-http2-createwritereq.js similarity index 97% rename from test/parallel/test-http2-createwritereq.js rename to test/http2/parallel/test-http2-createwritereq.js index f4151d94e6aa..a1f06b4aca7e 100644 --- a/test/parallel/test-http2-createwritereq.js +++ b/test/http2/parallel/test-http2-createwritereq.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-date-header.js b/test/http2/parallel/test-http2-date-header.js similarity index 95% rename from test/parallel/test-http2-date-header.js rename to test/http2/parallel/test-http2-date-header.js index d7afeb5e2b90..aa05c5539597 100644 --- a/test/parallel/test-http2-date-header.js +++ b/test/http2/parallel/test-http2-date-header.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-dont-override.js b/test/http2/parallel/test-http2-dont-override.js similarity index 97% rename from test/parallel/test-http2-dont-override.js rename to test/http2/parallel/test-http2-dont-override.js index d8573eac340b..1075a02e1361 100644 --- a/test/parallel/test-http2-dont-override.js +++ b/test/http2/parallel/test-http2-dont-override.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-getpackedsettings.js b/test/http2/parallel/test-http2-getpackedsettings.js similarity index 99% rename from test/parallel/test-http2-getpackedsettings.js rename to test/http2/parallel/test-http2-getpackedsettings.js index 8c46afcb57fd..6f64426d5c83 100644 --- a/test/parallel/test-http2-getpackedsettings.js +++ b/test/http2/parallel/test-http2-getpackedsettings.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-goaway-opaquedata.js b/test/http2/parallel/test-http2-goaway-opaquedata.js similarity index 96% rename from test/parallel/test-http2-goaway-opaquedata.js rename to test/http2/parallel/test-http2-goaway-opaquedata.js index 9ff8b13cafd2..19260df33e89 100644 --- a/test/parallel/test-http2-goaway-opaquedata.js +++ b/test/http2/parallel/test-http2-goaway-opaquedata.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-head-request.js b/test/http2/parallel/test-http2-head-request.js similarity index 97% rename from test/parallel/test-http2-head-request.js rename to test/http2/parallel/test-http2-head-request.js index ee86ded54988..15605be1ed79 100644 --- a/test/parallel/test-http2-head-request.js +++ b/test/http2/parallel/test-http2-head-request.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-https-fallback.js b/test/http2/parallel/test-http2-https-fallback.js similarity index 98% rename from test/parallel/test-http2-https-fallback.js rename to test/http2/parallel/test-http2-https-fallback.js index d49c7987143d..8c9ee7d804b8 100644 --- a/test/parallel/test-http2-https-fallback.js +++ b/test/http2/parallel/test-http2-https-fallback.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-info-headers.js b/test/http2/parallel/test-http2-info-headers.js similarity index 98% rename from test/parallel/test-http2-info-headers.js rename to test/http2/parallel/test-http2-info-headers.js index a1491959df39..37aed844d679 100644 --- a/test/parallel/test-http2-info-headers.js +++ b/test/http2/parallel/test-http2-info-headers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-max-concurrent-streams.js b/test/http2/parallel/test-http2-max-concurrent-streams.js similarity index 97% rename from test/parallel/test-http2-max-concurrent-streams.js rename to test/http2/parallel/test-http2-max-concurrent-streams.js index be101720dc47..9ba3548dcbae 100644 --- a/test/parallel/test-http2-max-concurrent-streams.js +++ b/test/http2/parallel/test-http2-max-concurrent-streams.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-methods.js b/test/http2/parallel/test-http2-methods.js similarity index 96% rename from test/parallel/test-http2-methods.js rename to test/http2/parallel/test-http2-methods.js index dac61359ec01..ba64f39173af 100644 --- a/test/parallel/test-http2-methods.js +++ b/test/http2/parallel/test-http2-methods.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-misc-util.js b/test/http2/parallel/test-http2-misc-util.js similarity index 96% rename from test/parallel/test-http2-misc-util.js rename to test/http2/parallel/test-http2-misc-util.js index eaa297309b14..bcc8530aeb34 100644 --- a/test/parallel/test-http2-misc-util.js +++ b/test/http2/parallel/test-http2-misc-util.js @@ -1,7 +1,7 @@ // Flags: --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-misused-pseudoheaders.js b/test/http2/parallel/test-http2-misused-pseudoheaders.js similarity index 96% rename from test/parallel/test-http2-misused-pseudoheaders.js rename to test/http2/parallel/test-http2-misused-pseudoheaders.js index 2744561025dc..2dc2bd6c36ae 100644 --- a/test/parallel/test-http2-misused-pseudoheaders.js +++ b/test/http2/parallel/test-http2-misused-pseudoheaders.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-multi-content-length.js b/test/http2/parallel/test-http2-multi-content-length.js similarity index 97% rename from test/parallel/test-http2-multi-content-length.js rename to test/http2/parallel/test-http2-multi-content-length.js index da7fbd33a9f8..1a4bb54aa0b1 100644 --- a/test/parallel/test-http2-multi-content-length.js +++ b/test/http2/parallel/test-http2-multi-content-length.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-multiheaders-raw.js b/test/http2/parallel/test-http2-multiheaders-raw.js similarity index 96% rename from test/parallel/test-http2-multiheaders-raw.js rename to test/http2/parallel/test-http2-multiheaders-raw.js index f9c7cc5f9bd4..ec1239331a74 100644 --- a/test/parallel/test-http2-multiheaders-raw.js +++ b/test/http2/parallel/test-http2-multiheaders-raw.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-multiheaders.js b/test/http2/parallel/test-http2-multiheaders.js similarity index 97% rename from test/parallel/test-http2-multiheaders.js rename to test/http2/parallel/test-http2-multiheaders.js index bcdc9458b327..6620f5f91c1b 100644 --- a/test/parallel/test-http2-multiheaders.js +++ b/test/http2/parallel/test-http2-multiheaders.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-multiplex.js b/test/http2/parallel/test-http2-multiplex.js similarity index 97% rename from test/parallel/test-http2-multiplex.js rename to test/http2/parallel/test-http2-multiplex.js index 22622392b8c8..d7d8de7e8729 100644 --- a/test/parallel/test-http2-multiplex.js +++ b/test/http2/parallel/test-http2-multiplex.js @@ -4,7 +4,7 @@ // Tests opening 100 concurrent simultaneous uploading streams over a single // connection and makes sure that the data for each is appropriately echoed. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-noflag.js b/test/http2/parallel/test-http2-noflag.js similarity index 89% rename from test/parallel/test-http2-noflag.js rename to test/http2/parallel/test-http2-noflag.js index 903fd649c5e4..84f7dd2a0e4b 100644 --- a/test/parallel/test-http2-noflag.js +++ b/test/http2/parallel/test-http2-noflag.js @@ -1,7 +1,7 @@ // The --expose-http2 flag is not set 'use strict'; -require('../common'); +require('../../common'); const assert = require('assert'); assert.throws(() => require('http2'), // eslint-disable-line crypto-check diff --git a/test/parallel/test-http2-options-max-headers-block-length.js b/test/http2/parallel/test-http2-options-max-headers-block-length.js similarity index 96% rename from test/parallel/test-http2-options-max-headers-block-length.js rename to test/http2/parallel/test-http2-options-max-headers-block-length.js index fe3eb9774835..6ee4189c3a9f 100644 --- a/test/parallel/test-http2-options-max-headers-block-length.js +++ b/test/http2/parallel/test-http2-options-max-headers-block-length.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-options-max-reserved-streams.js b/test/http2/parallel/test-http2-options-max-reserved-streams.js similarity index 98% rename from test/parallel/test-http2-options-max-reserved-streams.js rename to test/http2/parallel/test-http2-options-max-reserved-streams.js index 425ac6eb4ea7..780c6ba6eef5 100644 --- a/test/parallel/test-http2-options-max-reserved-streams.js +++ b/test/http2/parallel/test-http2-options-max-reserved-streams.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-padding-callback.js b/test/http2/parallel/test-http2-padding-callback.js similarity index 97% rename from test/parallel/test-http2-padding-callback.js rename to test/http2/parallel/test-http2-padding-callback.js index a63f1041f3f8..50f8eb36586c 100644 --- a/test/parallel/test-http2-padding-callback.js +++ b/test/http2/parallel/test-http2-padding-callback.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-priority-event.js b/test/http2/parallel/test-http2-priority-event.js similarity index 96% rename from test/parallel/test-http2-priority-event.js rename to test/http2/parallel/test-http2-priority-event.js index b577fdb37637..5e826659795f 100644 --- a/test/parallel/test-http2-priority-event.js +++ b/test/http2/parallel/test-http2-priority-event.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-request-response-proto.js b/test/http2/parallel/test-http2-request-response-proto.js similarity index 92% rename from test/parallel/test-http2-request-response-proto.js rename to test/http2/parallel/test-http2-request-response-proto.js index 3bbf8e864344..fab068be7f8f 100644 --- a/test/parallel/test-http2-request-response-proto.js +++ b/test/http2/parallel/test-http2-request-response-proto.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-respond-file-204.js b/test/http2/parallel/test-http2-respond-file-204.js similarity index 96% rename from test/parallel/test-http2-respond-file-204.js rename to test/http2/parallel/test-http2-respond-file-204.js index 2a531df46469..45c635cfc948 100644 --- a/test/parallel/test-http2-respond-file-204.js +++ b/test/http2/parallel/test-http2-respond-file-204.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-304.js b/test/http2/parallel/test-http2-respond-file-304.js similarity index 96% rename from test/parallel/test-http2-respond-file-304.js rename to test/http2/parallel/test-http2-respond-file-304.js index d36dd8411f93..da174dc64497 100644 --- a/test/parallel/test-http2-respond-file-304.js +++ b/test/http2/parallel/test-http2-respond-file-304.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-404.js b/test/http2/parallel/test-http2-respond-file-404.js similarity index 96% rename from test/parallel/test-http2-respond-file-404.js rename to test/http2/parallel/test-http2-respond-file-404.js index b8e2a39c9a2c..6b56cb8bac08 100644 --- a/test/parallel/test-http2-respond-file-404.js +++ b/test/http2/parallel/test-http2-respond-file-404.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-compat.js b/test/http2/parallel/test-http2-respond-file-compat.js similarity index 94% rename from test/parallel/test-http2-respond-file-compat.js rename to test/http2/parallel/test-http2-respond-file-compat.js index 53c5a34d2ae0..bc33fe4a1203 100644 --- a/test/parallel/test-http2-respond-file-compat.js +++ b/test/http2/parallel/test-http2-respond-file-compat.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-error-dir.js b/test/http2/parallel/test-http2-respond-file-error-dir.js similarity index 96% rename from test/parallel/test-http2-respond-file-error-dir.js rename to test/http2/parallel/test-http2-respond-file-error-dir.js index fd212a4c339d..7e353a77b302 100644 --- a/test/parallel/test-http2-respond-file-error-dir.js +++ b/test/http2/parallel/test-http2-respond-file-error-dir.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-errors.js b/test/http2/parallel/test-http2-respond-file-errors.js similarity index 98% rename from test/parallel/test-http2-respond-file-errors.js rename to test/http2/parallel/test-http2-respond-file-errors.js index 158c8cb4f074..3a17ce5de1e8 100644 --- a/test/parallel/test-http2-respond-file-errors.js +++ b/test/http2/parallel/test-http2-respond-file-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-fd-errors.js b/test/http2/parallel/test-http2-respond-file-fd-errors.js similarity index 98% rename from test/parallel/test-http2-respond-file-fd-errors.js rename to test/http2/parallel/test-http2-respond-file-fd-errors.js index 035699da50d1..fbe92947af66 100644 --- a/test/parallel/test-http2-respond-file-fd-errors.js +++ b/test/http2/parallel/test-http2-respond-file-fd-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-fd-invalid.js b/test/http2/parallel/test-http2-respond-file-fd-invalid.js similarity index 96% rename from test/parallel/test-http2-respond-file-fd-invalid.js rename to test/http2/parallel/test-http2-respond-file-fd-invalid.js index 7e08a29e9370..53206e750edf 100644 --- a/test/parallel/test-http2-respond-file-fd-invalid.js +++ b/test/http2/parallel/test-http2-respond-file-fd-invalid.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-fd-range.js b/test/http2/parallel/test-http2-respond-file-fd-range.js similarity index 98% rename from test/parallel/test-http2-respond-file-fd-range.js rename to test/http2/parallel/test-http2-respond-file-fd-range.js index 13b525c6c115..66efed86de56 100644 --- a/test/parallel/test-http2-respond-file-fd-range.js +++ b/test/http2/parallel/test-http2-respond-file-fd-range.js @@ -3,7 +3,7 @@ // Tests the ability to minimally request a byte range with respondWithFD -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-fd.js b/test/http2/parallel/test-http2-respond-file-fd.js similarity index 97% rename from test/parallel/test-http2-respond-file-fd.js rename to test/http2/parallel/test-http2-respond-file-fd.js index 502d6e86293d..101abd0988d0 100644 --- a/test/parallel/test-http2-respond-file-fd.js +++ b/test/http2/parallel/test-http2-respond-file-fd.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-push.js b/test/http2/parallel/test-http2-respond-file-push.js similarity index 98% rename from test/parallel/test-http2-respond-file-push.js rename to test/http2/parallel/test-http2-respond-file-push.js index b16a9e1c600d..8c4ca0e4d21c 100644 --- a/test/parallel/test-http2-respond-file-push.js +++ b/test/http2/parallel/test-http2-respond-file-push.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file-range.js b/test/http2/parallel/test-http2-respond-file-range.js similarity index 97% rename from test/parallel/test-http2-respond-file-range.js rename to test/http2/parallel/test-http2-respond-file-range.js index a4fda25a9017..5bb2fda53f5c 100644 --- a/test/parallel/test-http2-respond-file-range.js +++ b/test/http2/parallel/test-http2-respond-file-range.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-file.js b/test/http2/parallel/test-http2-respond-file.js similarity index 97% rename from test/parallel/test-http2-respond-file.js rename to test/http2/parallel/test-http2-respond-file.js index 3c5272f77fa0..12e8efde1713 100644 --- a/test/parallel/test-http2-respond-file.js +++ b/test/http2/parallel/test-http2-respond-file.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-respond-no-data.js b/test/http2/parallel/test-http2-respond-no-data.js similarity index 95% rename from test/parallel/test-http2-respond-no-data.js rename to test/http2/parallel/test-http2-respond-no-data.js index b2fbf44af193..88b7e9b2f5a8 100644 --- a/test/parallel/test-http2-respond-no-data.js +++ b/test/http2/parallel/test-http2-respond-no-data.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-response-splitting.js b/test/http2/parallel/test-http2-response-splitting.js similarity index 98% rename from test/parallel/test-http2-response-splitting.js rename to test/http2/parallel/test-http2-response-splitting.js index 557967a3df6c..7cf0daf34fb1 100644 --- a/test/parallel/test-http2-response-splitting.js +++ b/test/http2/parallel/test-http2-response-splitting.js @@ -5,7 +5,7 @@ // nghttp2 implementation automatically strips out the header values that // contain invalid characters. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-serve-file.js b/test/http2/parallel/test-http2-serve-file.js similarity index 98% rename from test/parallel/test-http2-serve-file.js rename to test/http2/parallel/test-http2-serve-file.js index b7149963a1b2..85eb6ecc73b3 100644 --- a/test/parallel/test-http2-serve-file.js +++ b/test/http2/parallel/test-http2-serve-file.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-server-destroy-before-additional.js b/test/http2/parallel/test-http2-server-destroy-before-additional.js similarity index 95% rename from test/parallel/test-http2-server-destroy-before-additional.js rename to test/http2/parallel/test-http2-server-destroy-before-additional.js index 5e04a87323e4..b7fdd2dc64b9 100644 --- a/test/parallel/test-http2-server-destroy-before-additional.js +++ b/test/http2/parallel/test-http2-server-destroy-before-additional.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-destroy-before-push.js b/test/http2/parallel/test-http2-server-destroy-before-push.js similarity index 95% rename from test/parallel/test-http2-server-destroy-before-push.js rename to test/http2/parallel/test-http2-server-destroy-before-push.js index 429f37e2c683..7ca719aa6dcf 100644 --- a/test/parallel/test-http2-server-destroy-before-push.js +++ b/test/http2/parallel/test-http2-server-destroy-before-push.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-destroy-before-respond.js b/test/http2/parallel/test-http2-server-destroy-before-respond.js similarity index 95% rename from test/parallel/test-http2-server-destroy-before-respond.js rename to test/http2/parallel/test-http2-server-destroy-before-respond.js index 4ea64e82812b..7a05cb8c5202 100644 --- a/test/parallel/test-http2-server-destroy-before-respond.js +++ b/test/http2/parallel/test-http2-server-destroy-before-respond.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-destroy-before-write.js b/test/http2/parallel/test-http2-server-destroy-before-write.js similarity index 95% rename from test/parallel/test-http2-server-destroy-before-write.js rename to test/http2/parallel/test-http2-server-destroy-before-write.js index 724e12624ef6..03790849450a 100644 --- a/test/parallel/test-http2-server-destroy-before-write.js +++ b/test/http2/parallel/test-http2-server-destroy-before-write.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-errors.js b/test/http2/parallel/test-http2-server-errors.js similarity index 98% rename from test/parallel/test-http2-server-errors.js rename to test/http2/parallel/test-http2-server-errors.js index 9280d63edb62..f7a3494aa69b 100644 --- a/test/parallel/test-http2-server-errors.js +++ b/test/http2/parallel/test-http2-server-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-push-disabled.js b/test/http2/parallel/test-http2-server-push-disabled.js similarity index 97% rename from test/parallel/test-http2-server-push-disabled.js rename to test/http2/parallel/test-http2-server-push-disabled.js index a9cdbd623973..89443357e5ec 100644 --- a/test/parallel/test-http2-server-push-disabled.js +++ b/test/http2/parallel/test-http2-server-push-disabled.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-push-stream-errors-args.js b/test/http2/parallel/test-http2-server-push-stream-errors-args.js similarity index 97% rename from test/parallel/test-http2-server-push-stream-errors-args.js rename to test/http2/parallel/test-http2-server-push-stream-errors-args.js index 7d0c1045941e..65fb885fc487 100644 --- a/test/parallel/test-http2-server-push-stream-errors-args.js +++ b/test/http2/parallel/test-http2-server-push-stream-errors-args.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-push-stream-errors.js b/test/http2/parallel/test-http2-server-push-stream-errors.js similarity index 98% rename from test/parallel/test-http2-server-push-stream-errors.js rename to test/http2/parallel/test-http2-server-push-stream-errors.js index ad26874f8a9f..ae5d4b64f19c 100644 --- a/test/parallel/test-http2-server-push-stream-errors.js +++ b/test/http2/parallel/test-http2-server-push-stream-errors.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-server-push-stream-head.js b/test/http2/parallel/test-http2-server-push-stream-head.js similarity index 97% rename from test/parallel/test-http2-server-push-stream-head.js rename to test/http2/parallel/test-http2-server-push-stream-head.js index a1172b8ecf37..90215d9a2dc7 100644 --- a/test/parallel/test-http2-server-push-stream-head.js +++ b/test/http2/parallel/test-http2-server-push-stream-head.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-push-stream.js b/test/http2/parallel/test-http2-server-push-stream.js similarity index 97% rename from test/parallel/test-http2-server-push-stream.js rename to test/http2/parallel/test-http2-server-push-stream.js index c79ff7caecf0..2c3094b8d02d 100644 --- a/test/parallel/test-http2-server-push-stream.js +++ b/test/http2/parallel/test-http2-server-push-stream.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-rst-before-respond.js b/test/http2/parallel/test-http2-server-rst-before-respond.js similarity index 96% rename from test/parallel/test-http2-server-rst-before-respond.js rename to test/http2/parallel/test-http2-server-rst-before-respond.js index d8e9d0a6cc5b..a1dae3220b8c 100644 --- a/test/parallel/test-http2-server-rst-before-respond.js +++ b/test/http2/parallel/test-http2-server-rst-before-respond.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-rst-stream.js b/test/http2/parallel/test-http2-server-rst-stream.js similarity index 98% rename from test/parallel/test-http2-server-rst-stream.js rename to test/http2/parallel/test-http2-server-rst-stream.js index 90966f7695b1..3daa8db7c447 100644 --- a/test/parallel/test-http2-server-rst-stream.js +++ b/test/http2/parallel/test-http2-server-rst-stream.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-set-header.js b/test/http2/parallel/test-http2-server-set-header.js similarity index 96% rename from test/parallel/test-http2-server-set-header.js rename to test/http2/parallel/test-http2-server-set-header.js index b681469ece2b..1e6a4049a23f 100644 --- a/test/parallel/test-http2-server-set-header.js +++ b/test/http2/parallel/test-http2-server-set-header.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-settimeout-no-callback.js b/test/http2/parallel/test-http2-server-settimeout-no-callback.js similarity index 95% rename from test/parallel/test-http2-server-settimeout-no-callback.js rename to test/http2/parallel/test-http2-server-settimeout-no-callback.js index eff0418fa7b6..2af5548e44b2 100644 --- a/test/parallel/test-http2-server-settimeout-no-callback.js +++ b/test/http2/parallel/test-http2-server-settimeout-no-callback.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-server-shutdown-before-respond.js b/test/http2/parallel/test-http2-server-shutdown-before-respond.js similarity index 95% rename from test/parallel/test-http2-server-shutdown-before-respond.js rename to test/http2/parallel/test-http2-server-shutdown-before-respond.js index f870edc7be6e..3763de49a80a 100644 --- a/test/parallel/test-http2-server-shutdown-before-respond.js +++ b/test/http2/parallel/test-http2-server-shutdown-before-respond.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-server-socket-destroy.js b/test/http2/parallel/test-http2-server-socket-destroy.js similarity index 97% rename from test/parallel/test-http2-server-socket-destroy.js rename to test/http2/parallel/test-http2-server-socket-destroy.js index d77f7355676f..b7fa7a5e8b88 100644 --- a/test/parallel/test-http2-server-socket-destroy.js +++ b/test/http2/parallel/test-http2-server-socket-destroy.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-server-socketerror.js b/test/http2/parallel/test-http2-server-socketerror.js similarity index 97% rename from test/parallel/test-http2-server-socketerror.js rename to test/http2/parallel/test-http2-server-socketerror.js index 5bbb2130f0ec..3047c0aede8e 100644 --- a/test/parallel/test-http2-server-socketerror.js +++ b/test/http2/parallel/test-http2-server-socketerror.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-server-startup.js b/test/http2/parallel/test-http2-server-startup.js similarity index 98% rename from test/parallel/test-http2-server-startup.js rename to test/http2/parallel/test-http2-server-startup.js index 1d236d2e65f2..1d772f588b14 100644 --- a/test/parallel/test-http2-server-startup.js +++ b/test/http2/parallel/test-http2-server-startup.js @@ -5,7 +5,7 @@ // HTTP2 server. The server does not do anything at this point // other than start listening. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); diff --git a/test/parallel/test-http2-server-timeout.js b/test/http2/parallel/test-http2-server-timeout.js similarity index 94% rename from test/parallel/test-http2-server-timeout.js rename to test/http2/parallel/test-http2-server-timeout.js index c3a8ef88517b..3a40ae0930b4 100755 --- a/test/parallel/test-http2-server-timeout.js +++ b/test/http2/parallel/test-http2-server-timeout.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-session-settings.js b/test/http2/parallel/test-http2-session-settings.js similarity index 98% rename from test/parallel/test-http2-session-settings.js rename to test/http2/parallel/test-http2-session-settings.js index 7f54bc2f02dc..3091c052b2ff 100644 --- a/test/parallel/test-http2-session-settings.js +++ b/test/http2/parallel/test-http2-session-settings.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-session-stream-state.js b/test/http2/parallel/test-http2-session-stream-state.js similarity index 98% rename from test/parallel/test-http2-session-stream-state.js rename to test/http2/parallel/test-http2-session-stream-state.js index f122b2718997..33fb139c28a1 100644 --- a/test/parallel/test-http2-session-stream-state.js +++ b/test/http2/parallel/test-http2-session-stream-state.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-session-timeout.js b/test/http2/parallel/test-http2-session-timeout.js similarity index 95% rename from test/parallel/test-http2-session-timeout.js rename to test/http2/parallel/test-http2-session-timeout.js index 27cab3d8bdb2..3b759a87571d 100644 --- a/test/parallel/test-http2-session-timeout.js +++ b/test/http2/parallel/test-http2-session-timeout.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-single-headers.js b/test/http2/parallel/test-http2-single-headers.js similarity index 97% rename from test/parallel/test-http2-single-headers.js rename to test/http2/parallel/test-http2-single-headers.js index cf66e570f91b..01597abca210 100644 --- a/test/parallel/test-http2-single-headers.js +++ b/test/http2/parallel/test-http2-single-headers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); diff --git a/test/parallel/test-http2-status-code-invalid.js b/test/http2/parallel/test-http2-status-code-invalid.js similarity index 96% rename from test/parallel/test-http2-status-code-invalid.js rename to test/http2/parallel/test-http2-status-code-invalid.js index 0fe8319db414..d5ceffd8818c 100644 --- a/test/parallel/test-http2-status-code-invalid.js +++ b/test/http2/parallel/test-http2-status-code-invalid.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-status-code.js b/test/http2/parallel/test-http2-status-code.js similarity index 96% rename from test/parallel/test-http2-status-code.js rename to test/http2/parallel/test-http2-status-code.js index 9a6821b1d664..dff4450efb51 100644 --- a/test/parallel/test-http2-status-code.js +++ b/test/http2/parallel/test-http2-status-code.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-stream-client.js b/test/http2/parallel/test-http2-stream-client.js similarity index 95% rename from test/parallel/test-http2-stream-client.js rename to test/http2/parallel/test-http2-stream-client.js index 658c66ce7af8..996df9c29ba3 100644 --- a/test/parallel/test-http2-stream-client.js +++ b/test/http2/parallel/test-http2-stream-client.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-timeouts.js b/test/http2/parallel/test-http2-timeouts.js similarity index 95% rename from test/parallel/test-http2-timeouts.js rename to test/http2/parallel/test-http2-timeouts.js index a45b13826f6f..09c8d3d656b7 100644 --- a/test/parallel/test-http2-timeouts.js +++ b/test/http2/parallel/test-http2-timeouts.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const h2 = require('http2'); diff --git a/test/parallel/test-http2-too-many-settings.js b/test/http2/parallel/test-http2-too-many-settings.js similarity index 97% rename from test/parallel/test-http2-too-many-settings.js rename to test/http2/parallel/test-http2-too-many-settings.js index 849e24af4e7f..089108b4e976 100644 --- a/test/parallel/test-http2-too-many-settings.js +++ b/test/http2/parallel/test-http2-too-many-settings.js @@ -4,7 +4,7 @@ // Tests that attempting to send too many non-acknowledged // settings frames will result in a throw. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-trailers.js b/test/http2/parallel/test-http2-trailers.js similarity index 97% rename from test/parallel/test-http2-trailers.js rename to test/http2/parallel/test-http2-trailers.js index 282899e65ebf..b424c687bda3 100644 --- a/test/parallel/test-http2-trailers.js +++ b/test/http2/parallel/test-http2-trailers.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-util-assert-valid-pseudoheader.js b/test/http2/parallel/test-http2-util-assert-valid-pseudoheader.js similarity index 95% rename from test/parallel/test-http2-util-assert-valid-pseudoheader.js rename to test/http2/parallel/test-http2-util-assert-valid-pseudoheader.js index 27050fedd6c5..cfe0758e6aa5 100644 --- a/test/parallel/test-http2-util-assert-valid-pseudoheader.js +++ b/test/http2/parallel/test-http2-util-assert-valid-pseudoheader.js @@ -1,7 +1,7 @@ // Flags: --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); // Tests the assertValidPseudoHeader function that is used within the // mapToHeaders function. The assert function is not exported so we diff --git a/test/parallel/test-http2-util-asserts.js b/test/http2/parallel/test-http2-util-asserts.js similarity index 96% rename from test/parallel/test-http2-util-asserts.js rename to test/http2/parallel/test-http2-util-asserts.js index fd902f01a3d2..53ff45a32bc1 100644 --- a/test/parallel/test-http2-util-asserts.js +++ b/test/http2/parallel/test-http2-util-asserts.js @@ -1,7 +1,7 @@ // Flags: --expose-internals --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { assertIsObject, diff --git a/test/parallel/test-http2-util-headers-list.js b/test/http2/parallel/test-http2-util-headers-list.js similarity index 99% rename from test/parallel/test-http2-util-headers-list.js rename to test/http2/parallel/test-http2-util-headers-list.js index ac86e3473ea3..81f9beb8fbf8 100644 --- a/test/parallel/test-http2-util-headers-list.js +++ b/test/http2/parallel/test-http2-util-headers-list.js @@ -4,7 +4,7 @@ // Tests the internal utility function that is used to prepare headers // to pass to the internal binding layer. -const common = require('../common'); +const common = require('../../common'); const assert = require('assert'); const { mapToHeaders } = require('internal/http2/util'); diff --git a/test/parallel/test-http2-util-nghttp2error.js b/test/http2/parallel/test-http2-util-nghttp2error.js similarity index 89% rename from test/parallel/test-http2-util-nghttp2error.js rename to test/http2/parallel/test-http2-util-nghttp2error.js index 7a9009515b32..131f474b62ab 100644 --- a/test/parallel/test-http2-util-nghttp2error.js +++ b/test/http2/parallel/test-http2-util-nghttp2error.js @@ -1,7 +1,7 @@ // Flags: --expose-internals 'use strict'; -const common = require('../common'); +const common = require('../../common'); const { strictEqual } = require('assert'); const { NghttpError } = require('internal/http2/util'); diff --git a/test/parallel/test-http2-util-update-options-buffer.js b/test/http2/parallel/test-http2-util-update-options-buffer.js similarity index 98% rename from test/parallel/test-http2-util-update-options-buffer.js rename to test/http2/parallel/test-http2-util-update-options-buffer.js index 952b9e2dd52e..4b0cb93c196f 100644 --- a/test/parallel/test-http2-util-update-options-buffer.js +++ b/test/http2/parallel/test-http2-util-update-options-buffer.js @@ -1,7 +1,7 @@ // Flags: --expose-internals 'use strict'; -require('../common'); +require('../../common'); // Test coverage for the updateOptionsBuffer method used internally // by the http2 implementation. diff --git a/test/parallel/test-http2-window-size.js b/test/http2/parallel/test-http2-window-size.js similarity index 98% rename from test/parallel/test-http2-window-size.js rename to test/http2/parallel/test-http2-window-size.js index 57e27ac29bf7..7580d5d21ed3 100644 --- a/test/parallel/test-http2-window-size.js +++ b/test/http2/parallel/test-http2-window-size.js @@ -6,7 +6,7 @@ // TODO: This test makes large buffer allocations (128KiB) and should be tested // on smaller / IoT platforms in case this poses problems for these targets. -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-withflag.js b/test/http2/parallel/test-http2-withflag.js similarity index 81% rename from test/parallel/test-http2-withflag.js rename to test/http2/parallel/test-http2-withflag.js index 069212257c2f..388ad7923033 100644 --- a/test/parallel/test-http2-withflag.js +++ b/test/http2/parallel/test-http2-withflag.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-write-callbacks.js b/test/http2/parallel/test-http2-write-callbacks.js similarity index 96% rename from test/parallel/test-http2-write-callbacks.js rename to test/http2/parallel/test-http2-write-callbacks.js index e45e8ccb7d4a..af478281db69 100644 --- a/test/parallel/test-http2-write-callbacks.js +++ b/test/http2/parallel/test-http2-write-callbacks.js @@ -3,7 +3,7 @@ // Verifies that write callbacks are called -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-write-empty-string.js b/test/http2/parallel/test-http2-write-empty-string.js similarity index 96% rename from test/parallel/test-http2-write-empty-string.js rename to test/http2/parallel/test-http2-write-empty-string.js index e7a55e5c0a44..f43186577f77 100644 --- a/test/parallel/test-http2-write-empty-string.js +++ b/test/http2/parallel/test-http2-write-empty-string.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/parallel/test-http2-zero-length-write.js b/test/http2/parallel/test-http2-zero-length-write.js similarity index 96% rename from test/parallel/test-http2-zero-length-write.js rename to test/http2/parallel/test-http2-zero-length-write.js index f261cc72961e..bd7ca9174240 100644 --- a/test/parallel/test-http2-zero-length-write.js +++ b/test/http2/parallel/test-http2-zero-length-write.js @@ -1,7 +1,7 @@ // Flags: --expose-http2 'use strict'; -const common = require('../common'); +const common = require('../../common'); if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); diff --git a/test/http2/parallel/testcfg.py b/test/http2/parallel/testcfg.py new file mode 100644 index 000000000000..8b610b50b1d7 --- /dev/null +++ b/test/http2/parallel/testcfg.py @@ -0,0 +1,6 @@ +import sys, os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +import testpy + +def GetConfiguration(context, root): + return testpy.ParallelTestConfiguration(context, root, 'parallel') diff --git a/test/pummel/test-http-client-reconnect-bug.js b/test/pummel/test-http-client-reconnect-bug.js deleted file mode 100644 index d3e540166c27..000000000000 --- a/test/pummel/test-http-client-reconnect-bug.js +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -'use strict'; -const common = require('../common'); -const net = require('net'); -const http = require('http'); - -const server = net.createServer(function(socket) { - socket.end(); -}); - -server.on('listening', common.mustCall(function() { - const client = http.createClient(common.PORT); - - client.on('error', common.mustCall()); - client.on('end', common.mustCall()); - - const request = client.request('GET', '/', { 'host': 'localhost' }); - request.end(); - request.on('response', function(response) { - console.log(`STATUS: ${response.statusCode}`); - }); -})); - -server.listen(common.PORT); - -setTimeout(function() { - server.close(); -}, 500); diff --git a/tools/test.py b/tools/test.py index 935ec6c1fb86..9259b8e20534 100755 --- a/tools/test.py +++ b/tools/test.py @@ -810,7 +810,12 @@ class TestRepository(TestSuite): def __init__(self, path): normalized_path = abspath(path) - super(TestRepository, self).__init__(basename(normalized_path)) + # the relative path from the ./test directory is used + # for the test's name. + test_directory = abspath(join(dirname(sys.argv[0]), '../test')) + super(TestRepository, self).__init__( + os.path.relpath(normalized_path, test_directory) + ) self.path = normalized_path self.is_loaded = False self.config = None @@ -1531,28 +1536,15 @@ def ExpandCommand(args): return prefix + args + suffix return ExpandCommand - -BUILT_IN_TESTS = [ - 'sequential', - 'parallel', - 'pummel', - 'message', - 'internet', - 'addons', - 'addons-napi', - 'gc', - 'debugger', - 'doctool', - 'inspector', - 'async-hooks', -] - - +# we recursively walk folders in ./test and +# collect any folders that have a testcfg.py. def GetSuites(test_root): - def IsSuite(path): - return isdir(path) and exists(join(path, 'testcfg.py')) - return [ f for f in os.listdir(test_root) if IsSuite(join(test_root, f)) ] - + suites = [] + for root, dirs, files in os.walk(test_root): + for d in dirs: + if exists(join(root, d, 'testcfg.py')): + suites.append(join(root, d)) + return suites def FormatTime(d): millis = round(d * 1000) % 1000 @@ -1565,6 +1557,25 @@ def PrintCrashed(code): else: return "CRASHED (Signal: %d)" % -code +IGNORED_SUITES = [ + 'addons', + 'addons-napi', + 'gc', + 'internet', + 'pummel', + 'test-known-issues', + 'timers' +] + +# return any test suite folders that aren't ignored. Ignored +# suites represent special categories of tests, e.g., +# ./test/internet contains tests that require network connections. +def DefaultSuites(test_root): + built_in_tests = [] + for testdir in os.listdir(test_root): + if isdir(join(test_root, testdir)) and (testdir not in IGNORED_SUITES): + built_in_tests.append(testdir + '*') + return built_in_tests def Main(): parser = BuildOptions() @@ -1581,18 +1592,23 @@ def Main(): logger.addHandler(fh) workspace = abspath(join(dirname(sys.argv[0]), '..')) - suites = GetSuites(join(workspace, 'test')) + test_root = join(workspace, 'test') + suites = GetSuites(test_root) repositories = [TestRepository(join(workspace, 'test', name)) for name in suites] repositories += [TestRepository(a) for a in options.suite] root = LiteralTestSuite(repositories) + default_suites = [SplitPath(t) for t in DefaultSuites(test_root)] if len(args) == 0: - paths = [SplitPath(t) for t in BUILT_IN_TESTS] + paths = default_suites else: paths = [ ] for arg in args: - path = SplitPath(NormalizePath(arg)) - paths.append(path) + if arg == 'DEFAULT_JS_SUITES': + paths += default_suites + else: + path = SplitPath(NormalizePath(arg)) + paths.append(path) # Check for --valgrind option. If enabled, we overwrite the special # command flag with a command that uses the run-valgrind.py script. diff --git a/vcbuild.bat b/vcbuild.bat index cbe326c15a71..cf92211c1b01 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -44,7 +44,7 @@ set enable_static= set build_addons_napi= set test_node_inspect= set test_check_deopts= -set js_test_suites=abort async-hooks inspector known_issues message parallel sequential +set js_test_suites=DEFAULT_JS_SUITES set v8_test_options= set v8_build_options= set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"