diff --git a/patches/node/.patches b/patches/node/.patches index e6447a2d98dd..92738d2a80e1 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -8,7 +8,6 @@ refactor_allow_embedder_overriding_of_internal_fs_calls.patch chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch fix_handle_boringssl_and_openssl_incompatibilities.patch fix_crypto_tests_to_run_with_bssl.patch -fix_account_for_debugger_agent_race_condition.patch feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch support_v8_sandboxed_pointers.patch build_ensure_native_module_compilation_fails_if_not_using_a_new.patch diff --git a/patches/node/fix_account_for_debugger_agent_race_condition.patch b/patches/node/fix_account_for_debugger_agent_race_condition.patch deleted file mode 100644 index cd5a3eacd44b..000000000000 --- a/patches/node/fix_account_for_debugger_agent_race_condition.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Thu, 10 Jun 2021 15:15:35 +0200 -Subject: fix: account for debugger agent race condition - -In Electron the debugger agent hasn't necessarily been enabled by the -time the inspect prompt displays, leading to "Debugger agent is not enabled" -errors. This is remedied by adding a small timeout to the test. - -We'll either upstream this or figure out a better solution. - -diff --git a/test/parallel/test-debugger-address.mjs b/test/parallel/test-debugger-address.mjs -index eab99c9b0e2fb387ef9a716396e41c7fc93e93bc..ef8b20a60df88a0a412c309f597e1b1f652fef07 100644 ---- a/test/parallel/test-debugger-address.mjs -+++ b/test/parallel/test-debugger-address.mjs -@@ -56,6 +56,7 @@ function launchTarget(...args) { - const { childProc, host, port } = await launchTarget('--inspect=0', script); - target = childProc; - cli = startCLI([`${host || '127.0.0.1'}:${port}`]); -+ await new Promise(resolve => setTimeout(resolve, 1000)); - await cli.waitForPrompt(); - await cli.command('sb("alive.js", 3)'); - await cli.waitFor(/break/); -diff --git a/test/parallel/test-debugger-random-port-with-inspect-port.js b/test/parallel/test-debugger-random-port-with-inspect-port.js -index 3acc6bdd733eb002a2592960528bb04eebb2dc60..a9f2d29327464281c10d4c2210277eab47c9a262 100644 ---- a/test/parallel/test-debugger-random-port-with-inspect-port.js -+++ b/test/parallel/test-debugger-random-port-with-inspect-port.js -@@ -13,6 +13,7 @@ const script = fixtures.path('debugger', 'three-lines.js'); - const cli = startCLI(['--inspect-port=0', script]); - - (async () => { -+ await new Promise(resolve => setTimeout(resolve, 1000)); - await cli.waitForInitialBreak(); - await cli.waitForPrompt(); - assert.match(cli.output, /debug>/, 'prints a prompt'); -diff --git a/test/sequential/test-debugger-pid.js b/test/sequential/test-debugger-pid.js -index 99062149dfe3374b86439850e0655383e2bad662..78c173f5073818fae7d46413842cb7790130c3f5 100644 ---- a/test/sequential/test-debugger-pid.js -+++ b/test/sequential/test-debugger-pid.js -@@ -20,6 +20,7 @@ const runTest = async () => { - await cli.command('sb("alive.js", 3)'); - await cli.waitFor(/break/); - await cli.waitForPrompt(); -+ await new Promise(resolve => setTimeout(resolve, 1000)); - assert.match( - cli.output, - /> 3 {3}\+\+x;/,