From 221e00503daa1fd76c2a898815049e79a1870017 Mon Sep 17 00:00:00 2001 From: Mike Aizatsky Date: Wed, 21 Aug 2024 12:50:25 -0700 Subject: [PATCH 1/2] [nfc] lower test timeouts --- .bazelrc | 10 +- .github/workflows/test.yml | 2 +- src/cloudflare/internal/test/ai/BUILD.bazel | 1 + src/cloudflare/internal/test/d1/BUILD.bazel | 1 + .../internal/test/vectorize/BUILD.bazel | 1 + src/workerd/api/node/BUILD.bazel | 127 +++++++++++++++++- .../server/tests/compile-tests/BUILD.bazel | 2 +- .../server/tests/inspector/BUILD.bazel | 1 + .../server/tests/python/import_tests.bzl | 3 +- 9 files changed, 136 insertions(+), 12 deletions(-) diff --git a/.bazelrc b/.bazelrc index 562086aca19..09a3ec0c690 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,7 +1,13 @@ common --enable_platform_specific_config build --verbose_failures -build --build_tag_filters=-off-by-default,-slow -test --test_tag_filters=-off-by-default,-slow +build --build_tag_filters=-off-by-default +test --test_tag_filters=-off-by-default +# exclude enormous tests by default +build --test_size_filters=-enormous + +# use lower test timeouts: https://bazel.build/reference/test-encyclopedia#role-test-runner +# corresponds to small,medium,large,enormous tests (medium is default) +build --test_timeout=1,15,60,240 # Not using bzlmod for dependencies yet common --noenable_bzlmod diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index caca5837589..316f0c5c9d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -123,7 +123,7 @@ jobs: run: | cat <> .bazelrc build --build_tag_filters=-off-by-default - test --test_tag_filters=-off-by-default + test --test_tag_filters=-off-by-default --test_size_filters=small,medium,large,enormous EOF - name: Generate list of excluded Bazel targets # Exclude large benchmarking binaries created in debug and asan configurations to avoid diff --git a/src/cloudflare/internal/test/ai/BUILD.bazel b/src/cloudflare/internal/test/ai/BUILD.bazel index d8613a14a23..a7bc725d0b3 100644 --- a/src/cloudflare/internal/test/ai/BUILD.bazel +++ b/src/cloudflare/internal/test/ai/BUILD.bazel @@ -7,6 +7,7 @@ wd_test( ) wd_test( + size = "large", src = "python-ai-api-test.wd-test", args = ["--experimental"], data = glob([ diff --git a/src/cloudflare/internal/test/d1/BUILD.bazel b/src/cloudflare/internal/test/d1/BUILD.bazel index 702e399248f..fa166742134 100644 --- a/src/cloudflare/internal/test/d1/BUILD.bazel +++ b/src/cloudflare/internal/test/d1/BUILD.bazel @@ -7,6 +7,7 @@ wd_test( ) wd_test( + size = "large", src = "python-d1-api-test.wd-test", args = ["--experimental"], data = glob([ diff --git a/src/cloudflare/internal/test/vectorize/BUILD.bazel b/src/cloudflare/internal/test/vectorize/BUILD.bazel index d64efdcc987..9569fc690b3 100644 --- a/src/cloudflare/internal/test/vectorize/BUILD.bazel +++ b/src/cloudflare/internal/test/vectorize/BUILD.bazel @@ -6,6 +6,7 @@ wd_test( ) wd_test( + size = "large", src = "python-vectorize-api-test.wd-test", data = glob([ "*.py", diff --git a/src/workerd/api/node/BUILD.bazel b/src/workerd/api/node/BUILD.bazel index 0be107d8faf..9d0fc1d0bfe 100644 --- a/src/workerd/api/node/BUILD.bazel +++ b/src/workerd/api/node/BUILD.bazel @@ -26,10 +26,125 @@ kj_test( deps = ["//src/workerd/tests:test-fixture"], ) -[wd_test( - src = f, +wd_test( + src = "tests/assert-test.wd-test", args = ["--experimental"], - data = [f.removesuffix(".wd-test") + ".js"], -) for f in glob( - ["**/*.wd-test"], -)] + data = ["tests/assert-test.js"], +) + +wd_test( + size = "large", + src = "tests/buffer-nodejs-test.wd-test", + args = ["--experimental"], + data = ["tests/buffer-nodejs-test.js"], +) + +wd_test( + size = "large", + src = "tests/crypto_dh-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_dh-test.js"], +) + +wd_test( + src = "tests/crypto_hash-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_hash-test.js"], +) + +wd_test( + src = "tests/crypto_hkdf-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_hkdf-test.js"], +) + +wd_test( + src = "tests/crypto_hmac-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_hmac-test.js"], +) + +wd_test( + src = "tests/crypto_keys-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_keys-test.js"], +) + +wd_test( + src = "tests/crypto_pbkdf2-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_pbkdf2-test.js"], +) + +wd_test( + src = "tests/crypto_random-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_random-test.js"], +) + +wd_test( + src = "tests/crypto_scrypt-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_scrypt-test.js"], +) + +wd_test( + src = "tests/crypto_spkac-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_spkac-test.js"], +) + +wd_test( + src = "tests/crypto_x509-test.wd-test", + args = ["--experimental"], + data = ["tests/crypto_x509-test.js"], +) + +wd_test( + src = "tests/diagnostics-channel-test.wd-test", + args = ["--experimental"], + data = ["tests/diagnostics-channel-test.js"], +) + +wd_test( + src = "tests/mimetype-test.wd-test", + args = ["--experimental"], + data = ["tests/mimetype-test.js"], +) + +wd_test( + src = "tests/node-compat-v2-test.wd-test", + args = ["--experimental"], + data = ["tests/node-compat-v2-test.js"], +) + +wd_test( + src = "tests/path-test.wd-test", + args = ["--experimental"], + data = ["tests/path-test.js"], +) + +wd_test( + size = "large", + src = "tests/streams-test.wd-test", + args = ["--experimental"], + data = ["tests/streams-test.js"], +) + +wd_test( + src = "tests/string-decoder-test.wd-test", + args = ["--experimental"], + data = ["tests/string-decoder-test.js"], +) + +wd_test( + src = "tests/util-nodejs-test.wd-test", + args = ["--experimental"], + data = ["tests/util-nodejs-test.js"], +) + +wd_test( + src = "tests/zlib-nodejs-test.wd-test", + args = ["--experimental"], + data = ["tests/zlib-nodejs-test.js"], +) diff --git a/src/workerd/server/tests/compile-tests/BUILD.bazel b/src/workerd/server/tests/compile-tests/BUILD.bazel index 0e6df7404cd..c9f3d027bf4 100644 --- a/src/workerd/server/tests/compile-tests/BUILD.bazel +++ b/src/workerd/server/tests/compile-tests/BUILD.bazel @@ -1,6 +1,6 @@ sh_test( name = "helloworld_compile_test", - size = "small", + size = "medium", srcs = ["compile-test.sh"], args = [ "$(location //src/workerd/server:workerd)", diff --git a/src/workerd/server/tests/inspector/BUILD.bazel b/src/workerd/server/tests/inspector/BUILD.bazel index a6ad636e4af..bd68001ab52 100644 --- a/src/workerd/server/tests/inspector/BUILD.bazel +++ b/src/workerd/server/tests/inspector/BUILD.bazel @@ -2,6 +2,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_test") js_test( name = "inspector-test", + size = "large", data = [ ":config.capnp", ":index.mjs", diff --git a/src/workerd/server/tests/python/import_tests.bzl b/src/workerd/server/tests/python/import_tests.bzl index 81967d041e8..0336f5a6c4d 100644 --- a/src/workerd/server/tests/python/import_tests.bzl +++ b/src/workerd/server/tests/python/import_tests.bzl @@ -44,13 +44,11 @@ def gen_import_tests(to_test): name = worker_py_fname + "@rule", out = worker_py_fname, content = [generate_import_py_file(to_test[lib])], - tags = ["slow"], ) write_file( name = wd_test_fname + "@rule", out = wd_test_fname, content = [generate_wd_test_file(lib)], - tags = ["slow"], ) py_wd_test( @@ -58,4 +56,5 @@ def gen_import_tests(to_test): args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels"], data = [worker_py_fname, "@all_pyodide_wheels//:whls"], tags = ["slow"], + size = "enormous", ) From 7576a36ecc0407b50eadf6cf551eb29645823893 Mon Sep 17 00:00:00 2001 From: Mike Aizatsky Date: Wed, 21 Aug 2024 21:32:37 -0700 Subject: [PATCH 2/2] Update BUILD.bazel --- src/workerd/api/node/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workerd/api/node/BUILD.bazel b/src/workerd/api/node/BUILD.bazel index 9d0fc1d0bfe..b0bf7ca68ef 100644 --- a/src/workerd/api/node/BUILD.bazel +++ b/src/workerd/api/node/BUILD.bazel @@ -40,7 +40,7 @@ wd_test( ) wd_test( - size = "large", + size = "enormous", src = "tests/crypto_dh-test.wd-test", args = ["--experimental"], data = ["tests/crypto_dh-test.js"],