about summary refs log tree commit diff
path: root/src/libstd/io/signal.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-07-30 20:07:41 -0700
committerBrian Anderson <banderson@mozilla.com>2014-08-13 11:31:47 -0700
commit63cd4acf535f8df177459559fe2d7e6ab390c6d8 (patch)
tree4f10ee436e87176f9141071d2a7a13d5ee499ba8 /src/libstd/io/signal.rs
parent734834c7d6e4862c8348a8c9660bb338773047ca (diff)
downloadrust-63cd4acf535f8df177459559fe2d7e6ab390c6d8.tar.gz
rust-63cd4acf535f8df177459559fe2d7e6ab390c6d8.zip
std: Clarify what timers do with zero and negative durations
Add tests. Also fix a bunch of broken time tests.
Diffstat (limited to 'src/libstd/io/signal.rs')
-rw-r--r--src/libstd/io/signal.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/io/signal.rs b/src/libstd/io/signal.rs
index 4ea91131f17..10739c70143 100644
--- a/src/libstd/io/signal.rs
+++ b/src/libstd/io/signal.rs
@@ -167,6 +167,7 @@ mod test_unix {
     use comm::Empty;
     use io::timer;
     use super::{Listener, Interrupt};
+    use time::Duration;
 
     fn sigint() {
         unsafe {
@@ -179,7 +180,7 @@ mod test_unix {
         let mut signal = Listener::new();
         signal.register(Interrupt).unwrap();
         sigint();
-        timer::sleep_ms(10);
+        timer::sleep(Duration::milliseconds(10));
         match signal.rx.recv() {
             Interrupt => (),
             s => fail!("Expected Interrupt, got {:?}", s),
@@ -193,7 +194,7 @@ mod test_unix {
         s1.register(Interrupt).unwrap();
         s2.register(Interrupt).unwrap();
         sigint();
-        timer::sleep_ms(10);
+        timer::sleep(Duration::milliseconds(10));
         match s1.rx.recv() {
             Interrupt => (),
             s => fail!("Expected Interrupt, got {:?}", s),
@@ -212,7 +213,7 @@ mod test_unix {
         s2.register(Interrupt).unwrap();
         s2.unregister(Interrupt);
         sigint();
-        timer::sleep_ms(10);
+        timer::sleep(Duration::milliseconds(10));
         assert_eq!(s2.rx.try_recv(), Err(Empty));
     }
 }