1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00

chore: upgrade flaky_test, fastwebsockets, base64, base32, notify (#24746)

This commit is contained in:
Ryan Dahl 2024-08-01 08:35:35 -04:00 committed by GitHub
parent 8e6b06b89d
commit c79cb339ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 108 additions and 127 deletions

126
Cargo.lock generated
View file

@ -270,7 +270,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -306,7 +306,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -317,7 +317,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -341,14 +341,14 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.2.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]] [[package]]
name = "backtrace" name = "backtrace"
@ -373,9 +373,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]] [[package]]
name = "base32" name = "base32"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076"
[[package]] [[package]]
name = "base64" name = "base64"
@ -457,7 +457,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 2.0.58", "syn 2.0.72",
"which 4.4.2", "which 4.4.2",
] ]
@ -1018,7 +1018,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -1845,7 +1845,7 @@ dependencies = [
"quote", "quote",
"strum", "strum",
"strum_macros", "strum_macros",
"syn 2.0.58", "syn 2.0.72",
"thiserror", "thiserror",
] ]
@ -2305,7 +2305,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2334,7 +2334,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2601,7 +2601,7 @@ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2745,11 +2745,12 @@ checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
[[package]] [[package]]
name = "fastwebsockets" name = "fastwebsockets"
version = "0.6.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" checksum = "26da0c7b5cef45c521a6f9cdfffdfeb6c9f5804fbac332deb5ae254634c7a6be"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"bytes",
"http-body-util", "http-body-util",
"hyper 1.4.1", "hyper 1.4.1",
"hyper-util", "hyper-util",
@ -2832,9 +2833,19 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]] [[package]]
name = "flaky_test" name = "flaky_test"
version = "0.1.0" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479cde5eb168cf5a056dd98f311cbfab7494c216394e4fb9eba0336827a8db93" checksum = "046caa1f23d7f751fc4ead3d6669a77fa5fc6cf6074960ddeb6a0b0a5b83c8da"
dependencies = [
"flaky_test_impl",
"futures-util",
]
[[package]]
name = "flaky_test_impl"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85e35909c2f0552fdae5b40f1e95a7da12afb58c1f2f455a12c216c58d869abe"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2885,7 +2896,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2917,7 +2928,7 @@ checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -3022,7 +3033,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -3729,7 +3740,7 @@ dependencies = [
"Inflector", "Inflector",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -3891,7 +3902,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -4334,7 +4345,7 @@ dependencies = [
"quote", "quote",
"serde", "serde",
"serde_json", "serde_json",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -4437,20 +4448,21 @@ dependencies = [
[[package]] [[package]]
name = "notify" name = "notify"
version = "5.0.0" version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.5.0",
"crossbeam-channel", "crossbeam-channel",
"filetime", "filetime",
"fsevent-sys", "fsevent-sys",
"inotify", "inotify",
"kqueue", "kqueue",
"libc", "libc",
"log",
"mio", "mio",
"walkdir", "walkdir",
"winapi", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
@ -4846,7 +4858,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -4929,7 +4941,7 @@ dependencies = [
"phf_shared 0.11.2", "phf_shared 0.11.2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -4967,7 +4979,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -5079,7 +5091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -5123,7 +5135,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
dependencies = [ dependencies = [
"proc-macro-rules-macros", "proc-macro-rules-macros",
"proc-macro2", "proc-macro2",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -5135,14 +5147,14 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.79" version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -5462,7 +5474,7 @@ checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -5986,7 +5998,7 @@ checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6009,7 +6021,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6351,7 +6363,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6388,7 +6400,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6516,7 +6528,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6565,7 +6577,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6650,7 +6662,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6781,7 +6793,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6817,7 +6829,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6839,7 +6851,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"swc_macros_common", "swc_macros_common",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -6855,9 +6867,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.58" version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7049,7 +7061,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -7135,7 +7147,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -7317,7 +7329,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -7345,7 +7357,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -7804,7 +7816,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -7838,7 +7850,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -8326,7 +8338,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -8346,7 +8358,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.58", "syn 2.0.72",
] ]
[[package]] [[package]]

View file

@ -89,8 +89,8 @@ node_resolver = { version = "0.3.0", path = "./ext/node_resolver" }
aes = "=0.8.3" aes = "=0.8.3"
anyhow = "1.0.57" anyhow = "1.0.57"
async-trait = "0.1.73" async-trait = "0.1.73"
base32 = "=0.4.0" base32 = "=0.5.1"
base64 = "0.21.4" base64 = "0.21.7"
bencher = "0.1" bencher = "0.1"
brotli = "6.0.0" brotli = "6.0.0"
bytes = "1.4.0" bytes = "1.4.0"
@ -110,7 +110,7 @@ elliptic-curve = { version = "0.13.4", features = ["alloc", "arithmetic", "ecdh"
encoding_rs = "=0.8.33" encoding_rs = "=0.8.33"
fast-socks5 = "0.9.6" fast-socks5 = "0.9.6"
faster-hex = "0.9" faster-hex = "0.9"
fastwebsockets = { version = "0.6", features = ["upgrade", "unstable-split"] } fastwebsockets = { version = "0.8", features = ["upgrade", "unstable-split"] }
filetime = "0.2.16" filetime = "0.2.16"
flate2 = { version = "1.0.26", default-features = false } flate2 = { version = "1.0.26", default-features = false }
fs3 = "0.5.0" fs3 = "0.5.0"
@ -136,7 +136,7 @@ log = "0.4.20"
lsp-types = "=0.94.1" # used by tower-lsp and "proposed" feature is unstable in patch releases lsp-types = "=0.94.1" # used by tower-lsp and "proposed" feature is unstable in patch releases
memmem = "0.1.1" memmem = "0.1.1"
monch = "=0.5.0" monch = "=0.5.0"
notify = "=5.0.0" notify = "=6.1.1"
num-bigint = { version = "0.4", features = ["rand"] } num-bigint = { version = "0.4", features = ["rand"] }
once_cell = "1.17.1" once_cell = "1.17.1"
os_pipe = { version = "=1.1.5", features = ["io_safety"] } os_pipe = { version = "=1.1.5", features = ["io_safety"] }

View file

@ -197,14 +197,14 @@ pub fn mixed_case_package_name_encode(name: &str) -> String {
// use base32 encoding because it's reversible and the character set // use base32 encoding because it's reversible and the character set
// only includes the characters within 0-9 and A-Z so it can be lower cased // only includes the characters within 0-9 and A-Z so it can be lower cased
base32::encode( base32::encode(
base32::Alphabet::RFC4648 { padding: false }, base32::Alphabet::Rfc4648Lower { padding: false },
name.as_bytes(), name.as_bytes(),
) )
.to_lowercase() .to_lowercase()
} }
pub fn mixed_case_package_name_decode(name: &str) -> Option<String> { pub fn mixed_case_package_name_decode(name: &str) -> Option<String> {
base32::decode(base32::Alphabet::RFC4648 { padding: false }, name) base32::decode(base32::Alphabet::Rfc4648Lower { padding: false }, name)
.and_then(|b| String::from_utf8(b).ok()) .and_then(|b| String::from_utf8(b).ok())
} }

View file

@ -45,7 +45,7 @@ deno_terminal.workspace = true
deno_tls.workspace = true deno_tls.workspace = true
fastwebsockets = { workspace = true, features = ["upgrade", "unstable-split"] } fastwebsockets = { workspace = true, features = ["upgrade", "unstable-split"] }
file_test_runner = "0.7.2" file_test_runner = "0.7.2"
flaky_test = "=0.1.0" flaky_test = "=0.2.2"
http.workspace = true http.workspace = true
http-body-util.workspace = true http-body-util.workspace = true
hyper.workspace = true hyper.workspace = true

View file

@ -192,8 +192,7 @@ fn child_lines(
(stdout_lines, stderr_lines) (stdout_lines, stderr_lines)
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn lint_watch_test() { async fn lint_watch_test() {
let t = TempDir::new(); let t = TempDir::new();
let badly_linted_original = let badly_linted_original =
@ -248,8 +247,7 @@ async fn lint_watch_test() {
child.kill().unwrap(); child.kill().unwrap();
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn lint_watch_without_args_test() { async fn lint_watch_without_args_test() {
let t = TempDir::new(); let t = TempDir::new();
let badly_linted_original = let badly_linted_original =
@ -304,8 +302,7 @@ async fn lint_watch_without_args_test() {
drop(t); drop(t);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn lint_all_files_on_each_change_test() { async fn lint_all_files_on_each_change_test() {
let t = TempDir::new(); let t = TempDir::new();
let badly_linted_fixed0 = let badly_linted_fixed0 =
@ -349,8 +346,7 @@ async fn lint_all_files_on_each_change_test() {
drop(t); drop(t);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn fmt_watch_test() { async fn fmt_watch_test() {
let fmt_testdata_path = util::testdata_path().join("fmt"); let fmt_testdata_path = util::testdata_path().join("fmt");
let t = TempDir::new(); let t = TempDir::new();
@ -405,8 +401,7 @@ async fn fmt_watch_test() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn fmt_watch_without_args_test() { async fn fmt_watch_without_args_test() {
let fmt_testdata_path = util::testdata_path().join("fmt"); let fmt_testdata_path = util::testdata_path().join("fmt");
let t = TempDir::new(); let t = TempDir::new();
@ -458,8 +453,7 @@ async fn fmt_watch_without_args_test() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn fmt_check_all_files_on_each_change_test() { async fn fmt_check_all_files_on_each_change_test() {
let t = TempDir::new(); let t = TempDir::new();
let fmt_testdata_path = util::testdata_path().join("fmt"); let fmt_testdata_path = util::testdata_path().join("fmt");
@ -498,8 +492,7 @@ async fn fmt_check_all_files_on_each_change_test() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn bundle_js_watch() { async fn bundle_js_watch() {
use std::path::PathBuf; use std::path::PathBuf;
// Test strategy extends this of test bundle_js by adding watcher // Test strategy extends this of test bundle_js by adding watcher
@ -573,8 +566,7 @@ async fn bundle_js_watch() {
} }
/// Confirm that the watcher continues to work even if module resolution fails at the *first* attempt /// Confirm that the watcher continues to work even if module resolution fails at the *first* attempt
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn bundle_watch_not_exit() { async fn bundle_watch_not_exit() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.ts"); let file_to_watch = t.path().join("file_to_watch.ts");
@ -637,8 +629,7 @@ async fn bundle_watch_not_exit() {
check_alive_then_kill(deno); check_alive_then_kill(deno);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_no_dynamic() { async fn run_watch_no_dynamic() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -720,8 +711,7 @@ async fn run_watch_no_dynamic() {
// if that's because of a bug in code or the runner itself. We should reenable // if that's because of a bug in code or the runner itself. We should reenable
// it once we upgrade to XL runners for macOS. // it once we upgrade to XL runners for macOS.
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_external_watch_files() { async fn run_watch_external_watch_files() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -764,8 +754,7 @@ async fn run_watch_external_watch_files() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_load_unload_events() { async fn run_watch_load_unload_events() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -828,8 +817,7 @@ async fn run_watch_load_unload_events() {
} }
/// Confirm that the watcher continues to work even if module resolution fails at the *first* attempt /// Confirm that the watcher continues to work even if module resolution fails at the *first* attempt
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_not_exit() { async fn run_watch_not_exit() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -862,8 +850,7 @@ async fn run_watch_not_exit() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_with_import_map_and_relative_paths() { async fn run_watch_with_import_map_and_relative_paths() {
fn create_relative_tmp_file( fn create_relative_tmp_file(
directory: &TempDir, directory: &TempDir,
@ -916,8 +903,7 @@ async fn run_watch_with_import_map_and_relative_paths() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_with_ext_flag() { async fn run_watch_with_ext_flag() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch"); let file_to_watch = t.path().join("file_to_watch");
@ -953,8 +939,7 @@ async fn run_watch_with_ext_flag() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_error_messages() { async fn run_watch_error_messages() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -984,8 +969,7 @@ async fn run_watch_error_messages() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_basic() { async fn test_watch_basic() {
let t = TempDir::new(); let t = TempDir::new();
@ -1140,8 +1124,7 @@ async fn test_watch_basic() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_doc() { async fn test_watch_doc() {
let t = TempDir::new(); let t = TempDir::new();
@ -1189,8 +1172,7 @@ async fn test_watch_doc() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_module_graph_error_referrer() { async fn test_watch_module_graph_error_referrer() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1218,8 +1200,7 @@ async fn test_watch_module_graph_error_referrer() {
} }
// Regression test for https://github.com/denoland/deno/issues/15428. // Regression test for https://github.com/denoland/deno/issues/15428.
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_unload_handler_error_on_drop() { async fn test_watch_unload_handler_error_on_drop() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1249,8 +1230,7 @@ async fn test_watch_unload_handler_error_on_drop() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_blob_urls_reset() { async fn run_watch_blob_urls_reset() {
let _g = util::http_server(); let _g = util::http_server();
let t = TempDir::new(); let t = TempDir::new();
@ -1291,8 +1271,7 @@ async fn run_watch_blob_urls_reset() {
} }
#[cfg(unix)] #[cfg(unix)]
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_sigint() { async fn test_watch_sigint() {
use nix::sys::signal; use nix::sys::signal;
use nix::sys::signal::Signal; use nix::sys::signal::Signal;
@ -1317,8 +1296,7 @@ async fn test_watch_sigint() {
assert_eq!(exit_status.code(), Some(130)); assert_eq!(exit_status.code(), Some(130));
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn bench_watch_basic() { async fn bench_watch_basic() {
let t = TempDir::new(); let t = TempDir::new();
@ -1431,8 +1409,7 @@ async fn bench_watch_basic() {
} }
// Regression test for https://github.com/denoland/deno/issues/15465. // Regression test for https://github.com/denoland/deno/issues/15465.
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_reload_once() { async fn run_watch_reload_once() {
let _g = util::http_server(); let _g = util::http_server();
let t = TempDir::new(); let t = TempDir::new();
@ -1470,8 +1447,7 @@ async fn run_watch_reload_once() {
/// Regression test for https://github.com/denoland/deno/issues/18960. Ensures that Deno.serve /// Regression test for https://github.com/denoland/deno/issues/18960. Ensures that Deno.serve
/// operates properly after a watch restart. /// operates properly after a watch restart.
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn test_watch_serve() { async fn test_watch_serve() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1507,8 +1483,7 @@ async fn test_watch_serve() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_dynamic_imports() { async fn run_watch_dynamic_imports() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1594,8 +1569,7 @@ async fn run_watch_dynamic_imports() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_inspect() { async fn run_watch_inspect() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1636,8 +1610,7 @@ async fn run_watch_inspect() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_watch_with_excluded_paths() { async fn run_watch_with_excluded_paths() {
let t = TempDir::new(); let t = TempDir::new();
@ -1676,8 +1649,7 @@ async fn run_watch_with_excluded_paths() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_hmr_server() { async fn run_hmr_server() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1750,8 +1722,7 @@ console.log("Listening...")
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_hmr_jsx() { async fn run_hmr_jsx() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1762,7 +1733,7 @@ import { foo } from "./foo.jsx";
let i = 0; let i = 0;
setInterval(() => { setInterval(() => {
console.log(i++, foo()); console.log(i++, foo());
}, 100); }, 100);
"#, "#,
); );
let file_to_watch2 = t.path().join("foo.jsx"); let file_to_watch2 = t.path().join("foo.jsx");
@ -1806,8 +1777,7 @@ export function foo() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_hmr_uncaught_error() { async fn run_hmr_uncaught_error() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");
@ -1867,8 +1837,7 @@ export function foo() {
check_alive_then_kill(child); check_alive_then_kill(child);
} }
#[flaky_test] #[flaky_test(tokio)]
#[tokio::main]
async fn run_hmr_unhandled_rejection() { async fn run_hmr_unhandled_rejection() {
let t = TempDir::new(); let t = TempDir::new();
let file_to_watch = t.path().join("file_to_watch.js"); let file_to_watch = t.path().join("file_to_watch.js");