partially merge revision(s) 5f69a7f60467fa58c2f998daffab43e118bff36c: [Backport #17666]

Co-authored-by: Samuel Williams <@ioquatix>
https://github.com/nagachika/ruby/pull/1/commits/2cee515f024f3295945f312cb6b052f972f9c93d

1 files changed, 45 insertions, 0 deletions

diff --git a/test/fiber/test_thread.rb b/test/fiber/test_thread.rb
new file mode 100644
index 0000000000..5fc80f0e6c
--- /dev/null
+++ b/test/fiber/test_thread.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+require "test/unit"
+require_relative 'scheduler'
+
+class TestFiberThread < Test::Unit::TestCase
+  def test_thread_join
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      result = nil
+      Fiber.schedule do
+        result = Thread.new{:done}.value
+      end
+
+      scheduler.run
+      result
+    end
+
+    assert_equal :done, thread.value
+  end
+
+  def test_thread_join_blocking
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      result = nil
+      Fiber.schedule do
+        Fiber.new(blocking: true) do
+          # This can deadlock if the blocking state is not taken into account:
+          Thread.new do
+            sleep(0)
+            result = :done
+          end.join
+        end.resume
+      end
+
+      scheduler.run
+      result
+    end
+
+    assert_equal :done, thread.value
+  end
+end