OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #21395 - sfackler:fix-cvar-test, r=alexcrichton 

r? @alexcrichton
This commit is contained in:
bors 2015-01-21 05:55:02 +00:00
parent 710dcdc2eb 2854f0c75e
commit 51e28dd0c8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/sync/condvar.rs
View File

@ -420,14 +420,15 @@ mod tests {
static M: StaticMutex = MUTEX_INIT;
let g = M.lock().unwrap();
let (g, success) = C.wait_timeout(g, Duration::nanoseconds(1000)).unwrap();
assert!(!success);
let (g, _no_timeout) = C.wait_timeout(g, Duration::nanoseconds(1000)).unwrap();
// spurious wakeups mean this isn't necessarily true
// assert!(!no_timeout);
let _t = Thread::spawn(move || {
let _g = M.lock().unwrap();
C.notify_one();
});
let (g, success) = C.wait_timeout(g, Duration::days(1)).unwrap();
assert!(success);
let (g, no_timeout) = C.wait_timeout(g, Duration::days(1)).unwrap();
assert!(no_timeout);
drop(g);
unsafe { C.destroy(); M.destroy(); }
}