Update to ruby/spec@e7dc804

3 files changed, 42 insertions, 14 deletions

diff --git a/spec/ruby/core/thread/kill_spec.rb b/spec/ruby/core/thread/kill_spec.rb
index f932bf5232..4b62c686c7 100644
--- a/spec/ruby/core/thread/kill_spec.rb
+++ b/spec/ruby/core/thread/kill_spec.rb
@@ -9,10 +9,6 @@ platform_is_not :mingw do
     it_behaves_like :thread_exit, :kill
   end
 
-  describe "Thread#kill!" do
-    it "needs to be reviewed for spec completeness"
-  end
-
   describe "Thread.kill" do
     it "causes the given thread to exit" do
       thread = Thread.new { sleep }
diff --git a/spec/ruby/core/thread/native_thread_id_spec.rb b/spec/ruby/core/thread/native_thread_id_spec.rb
index d6cc332bf6..8460a1db8c 100644
--- a/spec/ruby/core/thread/native_thread_id_spec.rb
+++ b/spec/ruby/core/thread/native_thread_id_spec.rb
@@ -1,17 +1,30 @@
 require_relative '../../spec_helper'
 
-if ruby_version_is "3.1" and Thread.method_defined?(:native_thread_id)
-  # This method is very platform specific
+ruby_version_is "3.1" do
+  platform_is :linux, :darwin, :windows, :freebsd do
+    describe "Thread#native_thread_id" do
+      it "returns an integer when the thread is alive" do
+        Thread.current.native_thread_id.should be_kind_of(Integer)
+      end
 
-  describe "Thread#native_thread_id" do
-    it "returns an integer when the thread is alive" do
-      Thread.current.native_thread_id.should be_kind_of(Integer)
-    end
+      it "returns nil when the thread is not running" do
+        t = Thread.new {}
+        t.join
+        t.native_thread_id.should == nil
+      end
+
+      it "each thread has different native thread id" do
+        t = Thread.new { sleep }
+        Thread.pass until t.stop?
+        main_thread_id = Thread.current.native_thread_id
+        t_thread_id = t.native_thread_id
 
-    it "returns nil when the thread is not running" do
-      t = Thread.new {}
-      t.join
-      t.native_thread_id.should == nil
+        t_thread_id.should be_kind_of(Integer)
+        main_thread_id.should_not == t_thread_id
+        t.run
+        t.join
+        t.native_thread_id.should == nil
+      end
     end
   end
 end
diff --git a/spec/ruby/core/thread/shared/exit.rb b/spec/ruby/core/thread/shared/exit.rb
index 3663827579..13e8832684 100644
--- a/spec/ruby/core/thread/shared/exit.rb
+++ b/spec/ruby/core/thread/shared/exit.rb
@@ -113,6 +113,25 @@ describe :thread_exit, shared: true do
     ScratchPad.recorded.should == nil
   end
 
+  it "kills other fibers of that thread without running their ensure clauses" do
+    t = Thread.new do
+      f = Fiber.new do
+        ScratchPad.record :fiber_resumed
+        begin
+          Fiber.yield
+        ensure
+          ScratchPad.record :fiber_ensure
+        end
+      end
+      f.resume
+      sleep
+    end
+    Thread.pass until t.stop?
+    t.send(@method)
+    t.join
+    ScratchPad.recorded.should == :fiber_resumed
+  end
+
   # This spec is a mess. It fails randomly, it hangs on MRI, it needs to be removed
   quarantine! do
   it "killing dying running does nothing" do