1 files changed, 33 insertions, 17 deletions
diff --git a/spec/ruby/core/mutex/sleep_spec.rb b/spec/ruby/core/mutex/sleep_spec.rb
index 72ed397eb5..71b089d251 100644
--- a/spec/ruby/core/mutex/sleep_spec.rb
+++ b/spec/ruby/core/mutex/sleep_spec.rb
@@ -4,32 +4,32 @@ describe "Mutex#sleep" do
   describe "when not locked by the current thread" do
     it "raises a ThreadError" do
       m = Mutex.new
-      lambda { m.sleep }.should raise_error(ThreadError)
+      -> { m.sleep }.should.raise(ThreadError)
     end
 
     it "raises an ArgumentError if passed a negative duration" do
       m = Mutex.new
-      lambda { m.sleep(-0.1) }.should raise_error(ArgumentError)
-      lambda { m.sleep(-1) }.should raise_error(ArgumentError)
+      -> { m.sleep(-0.1) }.should.raise(ArgumentError)
+      -> { m.sleep(-1) }.should.raise(ArgumentError)
     end
   end
 
   it "raises an ArgumentError if passed a negative duration" do
     m = Mutex.new
     m.lock
-    lambda { m.sleep(-0.1) }.should raise_error(ArgumentError)
-    lambda { m.sleep(-1) }.should raise_error(ArgumentError)
+    -> { m.sleep(-0.1) }.should.raise(ArgumentError)
+    -> { m.sleep(-1) }.should.raise(ArgumentError)
   end
 
   it "pauses execution for approximately the duration requested" do
     m = Mutex.new
     m.lock
-    duration = 0.1
+    duration = 0.001
     start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     m.sleep duration
     now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    (now - start).should > 0
-    (now - start).should < 2.0
+    (now - start).should >= 0
+    (now - start).should < (duration + TIME_TOLERANCE)
   end
 
   it "unlocks the mutex while sleeping" do
@@ -37,8 +37,8 @@ describe "Mutex#sleep" do
     locked = false
     th = Thread.new { m.lock; locked = true; m.sleep }
     Thread.pass until locked
-    Thread.pass while th.status and th.status != "sleep"
-    m.locked?.should be_false
+    Thread.pass until th.stop?
+    m.locked?.should == false
     th.run
     th.join
   end
@@ -46,8 +46,8 @@ describe "Mutex#sleep" do
   it "relocks the mutex when woken" do
     m = Mutex.new
     m.lock
-    m.sleep(0.01)
-    m.locked?.should be_true
+    m.sleep(0.001)
+    m.locked?.should == true
   end
 
   it "relocks the mutex when woken by an exception being raised" do
@@ -63,15 +63,31 @@ describe "Mutex#sleep" do
       end
     end
     Thread.pass until locked
-    Thread.pass while th.status and th.status != "sleep"
+    Thread.pass until th.stop?
     th.raise(Exception)
-    th.value.should be_true
+    th.value.should == true
   end
 
   it "returns the rounded number of seconds asleep" do
     m = Mutex.new
-    m.lock
-    m.sleep(0.01).should be_kind_of(Integer)
+    locked = false
+    th = Thread.start do
+      m.lock
+      locked = true
+      m.sleep
+    end
+    Thread.pass until locked
+    Thread.pass until th.stop?
+    th.wakeup
+    th.value.should.is_a?(Integer)
+  end
+
+  it "accepts nil as a sleep duration" do
+    m = Mutex.new
+    -> {
+      m.lock
+      m.sleep(nil)
+    }.should block_caller
   end
 
   it "wakes up when requesting sleep times near or equal to zero" do
@@ -89,7 +105,7 @@ describe "Mutex#sleep" do
     m.lock
     times.each do |time|
       # just testing that sleep completes
-      m.sleep(time).should_not == nil
+      -> {m.sleep(time)}.should_not.raise
     end
   end
 end