user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1692 - RalfJung:rustup, r=RalfJung

Browse source 
rustup; more slack for timing tests
This commit is contained in:
bors 2021-01-27 09:44:48 +00:00
commit e23e0b2d12
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rust-version
View file

@ -1 +1 @@
a8f707553276a15565860af3d415aae18428aa96
78e22069d018e83915201c8a218a0a94227f6420

2
tests/run-pass/concurrency/sync.rs
View file

@ -92,7 +92,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 <= 300);
assert!(100 <= elapsed_time && elapsed_time <= 500);
}
/// Test that signaling a conditional variable when waiting with a timeout works