Update to ruby/spec@cdd6ff7

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 49 insertions, 1 deletions

diff --git a/spec/ruby/core/thread/exclusive_spec.rb b/spec/ruby/core/thread/exclusive_spec.rb
index 522a43cac5..9de427fb52 100644
--- a/spec/ruby/core/thread/exclusive_spec.rb
+++ b/spec/ruby/core/thread/exclusive_spec.rb
@@ -14,5 +14,29 @@ describe "Thread.exclusive" do
     Thread.exclusive { :result }.should == :result
   end
 
-  it "needs to be reviewed for spec completeness"
+  it "blocks the caller if another thread is also in an exclusive block" do
+    m = Mutex.new
+    q1 = Queue.new
+    q2 = Queue.new
+
+    t = Thread.new {
+      Thread.exclusive {
+        q1.push :ready
+        q2.pop
+      }
+    }
+
+    q1.pop.should == :ready
+
+    lambda { Thread.exclusive { } }.should block_caller
+
+    q2.push :done
+    t.join
+  end
+
+  it "is not recursive" do
+    Thread.exclusive do
+      lambda { Thread.exclusive { } }.should raise_error(ThreadError)
+    end
+  end
 end
diff --git a/spec/ruby/core/thread/raise_spec.rb b/spec/ruby/core/thread/raise_spec.rb
index 0b18369cb9..38571854ef 100644
--- a/spec/ruby/core/thread/raise_spec.rb
+++ b/spec/ruby/core/thread/raise_spec.rb
@@ -78,6 +78,30 @@ describe "Thread#raise on a sleeping thread" do
     end
     -> { t.value }.should raise_error(RuntimeError)
   end
+
+  it "re-raises a previously rescued exception without overwriting the backtrace" do
+    t = Thread.new do
+      -> { # To make sure there is at least one entry in the call stack
+        begin
+          sleep
+        rescue => e
+          e
+        end
+      }.call
+    end
+
+    ThreadSpecs.spin_until_sleeping(t)
+
+    begin
+      initial_raise_line = __LINE__; raise 'raised'
+    rescue => raised
+      raise_again_line = __LINE__; t.raise raised
+      raised_again = t.value
+
+      raised_again.backtrace.first.should include("#{__FILE__}:#{initial_raise_line}:")
+      raised_again.backtrace.first.should_not include("#{__FILE__}:#{raise_again_line}:")
+    end
+  end
 end
 
 describe "Thread#raise on a running thread" do