Auto merge of #2063 - RalfJung:macos-timeout, r=RalfJung

bors · bors · commit 05bbfe84a9fd · 2022-04-10T15:24:33.000Z
increase slack for timeout test

This still sometimes fails on macOS, so let's increase the slack.
diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs
@@ -91,7 +91,7 @@ fn check_conditional_variables_timed_wait_timeout() {
     let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap();
     assert!(timeout.timed_out());
     let elapsed_time = now.elapsed().as_millis();
-    assert!(100 <= elapsed_time && elapsed_time <= 500);
+    assert!(100 <= elapsed_time && elapsed_time <= 800);
 }
 
 /// Test that signaling a conditional variable when waiting with a timeout works

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ fn check_conditional_variables_timed_wait_timeout() {`
`91`	`91`	`let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap();`
`92`	`92`	`assert!(timeout.timed_out());`
`93`	`93`	`let elapsed_time = now.elapsed().as_millis();`
`94`		`- assert!(100 <= elapsed_time && elapsed_time <= 500);`
	`94`	`+ assert!(100 <= elapsed_time && elapsed_time <= 800);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/// Test that signaling a conditional variable when waiting with a timeout works`