--- /dev/null
+Backport three commits from upstream to fix flaky assertions in oneshot tests
+
+Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/6970849fee93900b6eb28a64cf957157a9fb51b3]
+Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/dab350a3ed7691201f6752c4375e8e6ab40b58b9]
+Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/d02743e2fd7433ba2320fc85421a8a5927235b65]
+
+Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
+
+diff --git a/library/std/tests/sync/oneshot.rs b/library/std/tests/sync/oneshot.rs
+index 6a87c72..d8f3cd7 100644
+--- a/library/std/tests/sync/oneshot.rs
++++ b/library/std/tests/sync/oneshot.rs
+@@ -89,15 +89,15 @@ fn send_before_recv_timeout() {
+
+ assert!(sender.send(22i128).is_ok());
+
+- let start = Instant::now();
+-
+ let timeout = Duration::from_secs(1);
+ match receiver.recv_timeout(timeout) {
+ Ok(22) => {}
+ _ => panic!("expected Ok(22)"),
+ }
+
+- assert!(start.elapsed() < timeout);
++ // FIXME(#152648): There previously was a timing assertion here.
++ // This was removed, because under load there's no guarantee that the main thread is
++ // scheduled and run before `timeout` expires
+ }
+
+ #[test]
+@@ -127,6 +127,7 @@ fn recv_before_send() {
+ }
+
+ #[test]
++#[ignore = "Inherently flaky and has caused several CI failures"]
+ fn recv_timeout_before_send() {
+ let (sender, receiver) = oneshot::channel();
+
+@@ -135,6 +136,8 @@ fn recv_timeout_before_send() {
+ sender.send(99u128).unwrap();
+ });
+
++ // FIXME(#152145): Under load, there's no guarantee that thread `t` has
++ // ever been scheduled and run before this timeout expires.
+ match receiver.recv_timeout(Duration::from_secs(1)) {
+ Ok(99) => {}
+ _ => panic!("expected Ok(99)"),
+@@ -240,7 +243,9 @@ fn recv_deadline_passed() {
+ }
+
+ assert!(start.elapsed() >= timeout);
+- assert!(start.elapsed() < timeout * 3);
++ // FIXME(#152878): An upper-bound assertion on the elapsed time was removed,
++ // because CI runners can starve individual threads for a surprisingly long
++ // time, leading to flaky failures.
+ }
+
+ #[test]
+@@ -253,8 +258,11 @@ fn recv_time_passed() {
+ Err(RecvTimeoutError::Timeout(_)) => {}
+ _ => panic!("expected timeout error"),
+ }
++
+ assert!(start.elapsed() >= timeout);
+- assert!(start.elapsed() < timeout * 3);
++ // FIXME(#152878): An upper-bound assertion on the elapsed time was removed,
++ // because CI runners can starve individual threads for a surprisingly long
++ // time, leading to flaky failures.
+ }
+
+ #[test]
projects / thirdparty / openembedded / openembedded-core-contrib.git / commitdiff
