From 04338d75f64cb6aefad36a0761be62546df4339f Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Sun, 11 Aug 2024 15:48:16 -0700 Subject: [PATCH 1/3] Exclude flaky tests found in 1.81.0-beta.2 crater Minus ones that have merged fixes so far. --- config.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.toml b/config.toml index efed0167..0e1963e8 100644 --- a/config.toml +++ b/config.toml @@ -64,12 +64,14 @@ fe_session = { skip-tests = true } # flaky test feed = { skip-tests = true } # flaky test fftw = { slow = true } # build time close to 2 minutes fine_grained = { skip-tests = true } # flaky tests +gaffer = { skip-tests = true } # flaky tests (timing-dependent) gcc = { skip-tests = true } # flaky test gear = { skip = true } # flaky build geocode = { skip-tests = true } # depends on network glib = { slow = true } # tests slow to run guerrilla = { skip-tests = true } # flaky tests hashconsing = { skip-tests = true } # flaky test +hopscotch = { skip-tests = true } # flaky tests (quickcheck + inconsistent ords) hyperdav = { skip-tests = true } # relies on an external service idx = { skip-tests = true } # depends on filesystem image-stream = { skip-tests = true } # depends on network @@ -117,6 +119,7 @@ treeflection = { skip-tests = true } # flaky test update_rate = { skip-tests = true } # flaky tests urdf-viz = { skip = true } # flaky build vidar = { skip-tests = true } # flaky test +workpool = { skip-tests = true } # flaky tests (timing + thread::sleep in pool::collect_into_vec tests) carboxyl_time = { skip-tests = true } # flaky test (timing) cobalt = { skip-tests = true } # flaky test (timing) conduit-hyper = { skip-tests = true } # flaky test (timing) @@ -165,6 +168,7 @@ rustc_get_version = { skip = true } # does not build on beta "fromheten/plato" = { skip-tests = true } # flaky tests "jafow/pals" = { skip-tests = true } # flaky tests "johnedmonds/chance" = { skip-tests = true } # flaky tests +"lht102/coding-problems-practice" = { skip-tests = true } # version-dependent tests (sort_unstable_by ordering) "LukeMathWalker/tracing-bunyan-formatter" = { skip-tests = true } # flaky tests "nilsmartel/act" = { skip-tests = true } # flaky tests "nt-ca-aqe/kitchen-kata-async-rust" = { skip-tests = true } # flaky tests From 6d53a00096dd200c409b0e475ed641f6a16935bd Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Sun, 11 Aug 2024 15:57:07 -0700 Subject: [PATCH 2/3] Bump time to prevent inference failure --- Cargo.lock | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ffe78ce..09cc3aa9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2841,6 +2841,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -3963,13 +3969,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -3985,10 +3992,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] From 8b56ef53b855bebb1217ba278da3340c4a36c7cf Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Sun, 11 Aug 2024 16:19:49 -0700 Subject: [PATCH 3/3] appease lint about rust 2015-era code --- src/utils/disk_usage.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/disk_usage.rs b/src/utils/disk_usage.rs index 2ea4a491..6ee03257 100644 --- a/src/utils/disk_usage.rs +++ b/src/utils/disk_usage.rs @@ -38,7 +38,7 @@ fn current_mount() -> Fallible { let system = System::new(); let mut found = None; - let mut found_pos = std::usize::MAX; + let mut found_pos = usize::MAX; for mount in system.mounts()?.into_iter() { let path = Path::new(&mount.fs_mounted_on); for (i, ancestor) in current_dir.ancestors().enumerate() {