1 files changed, 20 insertions, 18 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 1f87304c3e..cdaec573d9 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -681,6 +681,26 @@ class TestThread < Test::Unit::TestCase
       assert_equal(:ok, q.pop)
     }
   end
+
+  def test_thread_timer_and_ensure
+    assert_normal_exit(<<_eom, 'r36492', timeout: 3)
+    flag = false
+    t = Thread.new do
+      begin
+        sleep
+      ensure
+        1 until flag
+      end
+    end
+
+    Thread.pass until t.status == "sleep"
+
+    t.kill
+    t.alive? == true
+    flag = true
+    t.join
+_eom
+  end
 end
 
 class TestThreadGroup < Test::Unit::TestCase
@@ -774,22 +794,4 @@ class TestThreadGroup < Test::Unit::TestCase
     end
     assert_in_delta(t1 - t0, 1, 1)
   end
-
-  def test_thread_timer_and_ensure
-    exit = false
-    t = Thread.new do
-      begin
-        sleep
-      ensure
-        1 until exit # Ruby 1.8 won't switch threads here
-      end
-    end
-
-    Thread.pass until t.status == "sleep"
-
-    t.kill
-    t.alive? == true
-    exit = true
-    t.join
-  end
 end