From f5e46c9bf2f50d66a953fa133161fc829cecff06 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Sat, 10 Feb 2024 13:22:13 -0700 Subject: chore: move cli/tests/ -> tests/ (#22369) This looks like a massive PR, but it's only a move from cli/tests -> tests, and updates of relative paths for files. This is the first step towards aggregate all of the integration test files under tests/, which will lead to a set of integration tests that can run without the CLI binary being built. While we could leave these tests under `cli`, it would require us to keep a more complex directory structure for the various test runners. In addition, we have a lot of complexity to ignore various test files in the `cli` project itself (cargo publish exclusion rules, autotests = false, etc). And finally, the `tests/` folder will eventually house the `test_ffi`, `test_napi` and other testing code, reducing the size of the root repo directory. For easier review, the extremely large and noisy "move" is in the first commit (with no changes -- just a move), while the remainder of the changes to actual files is in the second commit. --- .../test/pseudo-tty/console-dumb-tty.js | 16 ------------ .../node_compat/test/pseudo-tty/console_colors.js | 29 ---------------------- .../test/pseudo-tty/no_dropped_stdio.js | 26 ------------------- .../test/pseudo-tty/no_interleaved_stdio.js | 28 --------------------- cli/tests/node_compat/test/pseudo-tty/package.json | 1 - .../pseudo-tty/test-tty-color-support-warning-2.js | 15 ----------- .../pseudo-tty/test-tty-color-support-warning.js | 16 ------------ .../test/pseudo-tty/test-tty-stdin-end.js | 14 ----------- .../test/pseudo-tty/test-tty-stdout-end.js | 11 -------- 9 files changed, 156 deletions(-) delete mode 100644 cli/tests/node_compat/test/pseudo-tty/console-dumb-tty.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/console_colors.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/no_dropped_stdio.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/no_interleaved_stdio.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/package.json delete mode 100644 cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning-2.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/test-tty-stdin-end.js delete mode 100644 cli/tests/node_compat/test/pseudo-tty/test-tty-stdout-end.js (limited to 'cli/tests/node_compat/test/pseudo-tty') diff --git a/cli/tests/node_compat/test/pseudo-tty/console-dumb-tty.js b/cli/tests/node_compat/test/pseudo-tty/console-dumb-tty.js deleted file mode 100644 index 9b4bd1520..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/console-dumb-tty.js +++ /dev/null @@ -1,16 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; -require('../common'); - -process.env.TERM = 'dumb'; - -console.log({ foo: 'bar' }); -console.dir({ foo: 'bar' }); -console.log('%s q', 'string'); -console.log('%o with object format param', { foo: 'bar' }); diff --git a/cli/tests/node_compat/test/pseudo-tty/console_colors.js b/cli/tests/node_compat/test/pseudo-tty/console_colors.js deleted file mode 100644 index 2be464457..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/console_colors.js +++ /dev/null @@ -1,29 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; -require('../common'); -const vm = require('vm'); -// Make this test OS-independent by overriding stdio getColorDepth(). -process.stdout.getColorDepth = () => 8; -process.stderr.getColorDepth = () => 8; - -console.log({ foo: 'bar' }); -console.log('%s q', 'string'); -console.log('%o with object format param', { foo: 'bar' }); - -console.log( - new Error('test\n at abc (../fixtures/node_modules/bar.js:4:4)\nfoobar'), -); - -try { - require('../fixtures/node_modules/node_modules/bar.js'); -} catch (err) { - console.log(err); -} - -vm.runInThisContext('console.log(new Error())'); diff --git a/cli/tests/node_compat/test/pseudo-tty/no_dropped_stdio.js b/cli/tests/node_compat/test/pseudo-tty/no_dropped_stdio.js deleted file mode 100644 index d2bbb92c5..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/no_dropped_stdio.js +++ /dev/null @@ -1,26 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -// https://github.com/nodejs/node/issues/6456#issuecomment-219320599 -// https://gist.github.com/isaacs/1495b91ec66b21d30b10572d72ad2cdd -'use strict'; -const common = require('../common'); - -// 1000 bytes wrapped at 50 columns -// \n turns into a double-byte character -// (48 + {2}) * 20 = 1000 -let out = `${'o'.repeat(48)}\n`.repeat(20); -// Add the remaining 24 bytes and terminate with an 'O'. -// This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer. -out += `${'o'.repeat(24)}O`; - -// In AIX, the child exits even before the python parent -// can setup the readloop. Provide a reasonable delay. -setTimeout(function() { - process.stdout.write(out); - process.exit(0); -}, common.isAIX ? 200 : 0); diff --git a/cli/tests/node_compat/test/pseudo-tty/no_interleaved_stdio.js b/cli/tests/node_compat/test/pseudo-tty/no_interleaved_stdio.js deleted file mode 100644 index 895124420..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/no_interleaved_stdio.js +++ /dev/null @@ -1,28 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -// https://github.com/nodejs/node/issues/6456#issuecomment-219320599 -// https://gist.github.com/isaacs/1495b91ec66b21d30b10572d72ad2cdd -'use strict'; -const common = require('../common'); - -// 1000 bytes wrapped at 50 columns -// \n turns into a double-byte character -// (48 + {2}) * 20 = 1000 -let out = `${'o'.repeat(48)}\n`.repeat(20); -// Add the remaining 24 bytes and terminate with an 'O'. -// This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer. -out += `${'o'.repeat(24)}O`; - -const err = '__This is some stderr__'; - -// In AIX, the child exits even before the python parent -// can setup the readloop. Provide a reasonable delay. -setTimeout(function() { - process.stdout.write(out); - process.stderr.write(err); -}, common.isAIX ? 200 : 0); diff --git a/cli/tests/node_compat/test/pseudo-tty/package.json b/cli/tests/node_compat/test/pseudo-tty/package.json deleted file mode 100644 index 0967ef424..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning-2.js b/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning-2.js deleted file mode 100644 index 6a969ac9e..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning-2.js +++ /dev/null @@ -1,15 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; - -require('../common'); - -process.env.NODE_DISABLE_COLORS = '1'; -process.env.FORCE_COLOR = '3'; - -console.log(); diff --git a/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning.js b/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning.js deleted file mode 100644 index a9338105c..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/test-tty-color-support-warning.js +++ /dev/null @@ -1,16 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; - -require('../common'); - -process.env.NO_COLOR = '1'; -process.env.NODE_DISABLE_COLORS = '1'; -process.env.FORCE_COLOR = '3'; - -console.log(); diff --git a/cli/tests/node_compat/test/pseudo-tty/test-tty-stdin-end.js b/cli/tests/node_compat/test/pseudo-tty/test-tty-stdin-end.js deleted file mode 100644 index ee38cbd2c..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/test-tty-stdin-end.js +++ /dev/null @@ -1,14 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; -require('../common'); - -// This test ensures that Node.js doesn't crash on `process.stdin.emit("end")`. -// https://github.com/nodejs/node/issues/1068 - -process.stdin.emit('end'); diff --git a/cli/tests/node_compat/test/pseudo-tty/test-tty-stdout-end.js b/cli/tests/node_compat/test/pseudo-tty/test-tty-stdout-end.js deleted file mode 100644 index bd30a9a2e..000000000 --- a/cli/tests/node_compat/test/pseudo-tty/test-tty-stdout-end.js +++ /dev/null @@ -1,11 +0,0 @@ -// deno-fmt-ignore-file -// deno-lint-ignore-file - -// Copyright Joyent and Node contributors. All rights reserved. MIT license. -// Taken from Node 18.12.1 -// This file is automatically generated by `tools/node_compat/setup.ts`. Do not modify this file manually. - -'use strict'; -require('../common'); - -process.stdout.end(); -- cgit v1.2.3