1 files changed, 61 insertions, 0 deletions
diff --git a/test/fiber/test_thread.rb b/test/fiber/test_thread.rb
index 843604b5f1..5e3cc6d0e1 100644
--- a/test/fiber/test_thread.rb
+++ b/test/fiber/test_thread.rb
@@ -20,6 +20,53 @@ class TestFiberThread < Test::Unit::TestCase
     assert_equal :done, thread.value
   end
 
+  def test_thread_join_timeout
+    sleeper = nil
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        sleeper = Thread.new{sleep}
+        sleeper.join(0.1)
+      end
+
+      scheduler.run
+    end
+
+    thread.join
+
+    assert_predicate sleeper, :alive?
+  ensure
+    sleeper&.kill&.join
+  end
+
+  def test_thread_join_implicit
+    sleeping = false
+    finished = false
+
+    thread = Thread.new do
+      scheduler = Scheduler.new
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        sleeping = true
+        sleep(0.1)
+        finished = true
+      end
+
+      :done
+    end
+
+    Thread.pass until sleeping
+
+    thread.join
+
+    assert_equal :done, thread.value
+    assert finished, "Scheduler thread's task should be finished!"
+  end
+
   def test_thread_join_blocking
     thread = Thread.new do
       scheduler = Scheduler.new
@@ -66,4 +113,18 @@ class TestFiberThread < Test::Unit::TestCase
       thread.join
     end
   end
+
+  def test_thread_join_hang
+    thread = Thread.new do
+      scheduler = SleepingUnblockScheduler.new
+
+      Fiber.set_scheduler scheduler
+
+      Fiber.schedule do
+        Thread.new{sleep(0.01)}.value
+      end
+    end
+
+    thread.join
+  end
 end