From 9d525f98610fb65fa304cee33e8b6161f32a00b5 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 26 Apr 2023 10:11:14 +0200 Subject: [PATCH] test: formally mark some Node.js tests as flaky (#38117) --- patches/node/.patches | 2 +- ...t_formally_mark_some_tests_as_flaky.patch} | 28 ++++++++++++++++--- script/node-disabled-tests.json | 9 ------ 3 files changed, 25 insertions(+), 14 deletions(-) rename patches/node/{test_mark_cpu_prof_tests_as_flaky_in_electron.patch => test_formally_mark_some_tests_as_flaky.patch} (50%) diff --git a/patches/node/.patches b/patches/node/.patches index 03190292c50f..175faea88856 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -29,7 +29,7 @@ api_pass_oomdetails_to_oomerrorcallback.patch fix_expose_lookupandcompile_with_parameters.patch fix_prevent_changing_functiontemplateinfo_after_publish.patch enable_crashpad_linux_node_processes.patch -test_mark_cpu_prof_tests_as_flaky_in_electron.patch +test_formally_mark_some_tests_as_flaky.patch fix_adapt_debugger_tests_for_upstream_v8_changes.patch fix_libc_buffer_overflow_in_string_view_ctor.patch fix_preventing_potential_oob_in_ada_no_scheme_parsing.patch diff --git a/patches/node/test_mark_cpu_prof_tests_as_flaky_in_electron.patch b/patches/node/test_formally_mark_some_tests_as_flaky.patch similarity index 50% rename from patches/node/test_mark_cpu_prof_tests_as_flaky_in_electron.patch rename to patches/node/test_formally_mark_some_tests_as_flaky.patch index 8b40ddffd23a..5feaad2b9f61 100644 --- a/patches/node/test_mark_cpu_prof_tests_as_flaky_in_electron.patch +++ b/patches/node/test_formally_mark_some_tests_as_flaky.patch @@ -1,26 +1,46 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 8 Feb 2023 02:54:05 -0800 -Subject: test: mark cpu prof tests as flaky in electron +Subject: test: formally mark some tests as flaky Instead of disabling the tests, flag them as flaky so they still run but don't cause CI failures on flakes. +diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status +index 1cbcefb9712fae45b9a0ec7ed361bfe4ec7790be..6a6b52e9ae4150e7215e3587d8ddb41ce4374780 100644 +--- a/test/parallel/parallel.status ++++ b/test/parallel/parallel.status +@@ -5,6 +5,12 @@ prefix parallel + # sample-test : PASS,FLAKY + + [true] # This section applies to all platforms ++test-inspector-multisession-ws: PASS, FLAKY ++test-heapsnapshot-near-heap-limit-by-api-in-worker: PASS, FLAKY ++test-heapsnapshot-near-heap-limit-worker: PASS, FLAKY ++test-fetch: PASS, FLAKY ++test-cluster-bind-privileged-port: PASS, FLAKY ++test-cluster-shared-handle-bind-privileged-port: PASS, FLAKY + + [$system==win32] + # https://github.com/nodejs/node/issues/24497 diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status -index 5d88747b7066ce795b091eaaec2a5653f42b2c26..e3c7b531bc519bc97f363a1d4e7df2f059b11614 100644 +index 5d88747b7066ce795b091eaaec2a5653f42b2c26..c40cb8827c3e1b91f46147cead5a91a7520019b9 100644 --- a/test/sequential/sequential.status +++ b/test/sequential/sequential.status -@@ -7,6 +7,15 @@ prefix sequential +@@ -7,6 +7,18 @@ prefix sequential [true] # This section applies to all platforms # https://github.com/nodejs/node/issues/27611#issuecomment-613100468 test-cpu-prof-dir-worker: PASS, FLAKY +test-cpu-prof-dir-and-name: PASS, FLAKY -+test-cpu-prof-worker-argv: PASS, FLAKY ++test-cpu-prof-drained: PASS, FLAKY +test-cpu-prof-default: PASS, FLAKY +test-cpu-prof-dir-absolute: PASS, FLAKY +test-cpu-prof-dir-relative: PASS, FLAKY +test-cpu-prof-exit: PASS, FLAKY ++test-cpu-prof-kill: PASS, FLAKY +test-cpu-prof-name: PASS, FLAKY ++test-cpu-prof-worker-argv: PASS, FLAKY ++test-diagnostic-dir-cpu-prof: PASS, FLAKY +test-worker-prof: PASS, FLAKY +test-inspector-stop-profile-after-done: PASS, FLAKY # https://github.com/nodejs/node/issues/44898 diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json index 652eb3d1ca2f..46a34f20e062 100644 --- a/script/node-disabled-tests.json +++ b/script/node-disabled-tests.json @@ -5,8 +5,6 @@ "parallel/test-bootstrap-modules", "parallel/test-child-process-fork-exec-path", "parallel/test-cli-node-print-help", - "parallel/test-cluster-bind-privileged-port", - "parallel/test-cluster-shared-handle-bind-privileged-port", "parallel/test-code-cache", "parallel/test-crypto-aes-wrap", "parallel/test-crypto-authenticated-stream", @@ -22,16 +20,12 @@ "parallel/test-crypto-key-objects", "parallel/test-crypto-padding-aes256", "parallel/test-crypto-secure-heap", - "parallel/test-fetch", "parallel/test-fs-utimes-y2K38", - "parallel/test-heapsnapshot-near-heap-limit-by-api-in-worker", - "parallel/test-heapsnapshot-near-heap-limit-worker", "parallel/test-http2-clean-output", "parallel/test-https-agent-session-reuse", "parallel/test-https-options-boolean-check", "parallel/test-icu-minimum-version", "parallel/test-icu-env", - "parallel/test-inspector-multisession-ws", "parallel/test-inspector-port-zero-cluster", "parallel/test-inspector-tracing-domain", "parallel/test-module-loading-globalpaths", @@ -151,9 +145,6 @@ "report/test-report-uv-handles", "report/test-report-worker", "report/test-report-writereport", - "sequential/test-cpu-prof-kill", - "sequential/test-diagnostic-dir-cpu-prof", - "sequential/test-cpu-prof-drained", "sequential/test-tls-connect", "wpt/test-webcrypto" ]