1 files changed, 89 insertions, 93 deletions
diff --git a/spec/ruby/core/thread/report_on_exception_spec.rb b/spec/ruby/core/thread/report_on_exception_spec.rb
index 16597f3a4b..a6042ba759 100644
--- a/spec/ruby/core/thread/report_on_exception_spec.rb
+++ b/spec/ruby/core/thread/report_on_exception_spec.rb
@@ -1,120 +1,116 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "2.4" do
-  describe "Thread.report_on_exception" do
-    ruby_version_is "2.4"..."2.5" do
-      it "defaults to false" do
-        ruby_exe("p Thread.report_on_exception").should == "false\n"
-      end
+describe "Thread.report_on_exception" do
+  ruby_version_is "2.4"..."2.5" do
+    it "defaults to false" do
+      ruby_exe("p Thread.report_on_exception").should == "false\n"
     end
+  end
 
-    ruby_version_is "2.5" do
-      it "defaults to true" do
-        ruby_exe("p Thread.report_on_exception").should == "true\n"
-      end
+  ruby_version_is "2.5" do
+    it "defaults to true" do
+      ruby_exe("p Thread.report_on_exception").should == "true\n"
     end
   end
+end
 
-  describe "Thread.report_on_exception=" do
-    before :each do
-      @report_on_exception = Thread.report_on_exception
-    end
+describe "Thread.report_on_exception=" do
+  before :each do
+    @report_on_exception = Thread.report_on_exception
+  end
 
-    after :each do
-      Thread.report_on_exception = @report_on_exception
-    end
+  after :each do
+    Thread.report_on_exception = @report_on_exception
+  end
 
-    it "changes the default value for new threads" do
-      Thread.report_on_exception = true
-      Thread.report_on_exception.should == true
-      t = Thread.new {}
-      t.join
-      t.report_on_exception.should == true
-    end
+  it "changes the default value for new threads" do
+    Thread.report_on_exception = true
+    Thread.report_on_exception.should == true
+    t = Thread.new {}
+    t.join
+    t.report_on_exception.should == true
   end
+end
 
-  describe "Thread#report_on_exception" do
-    ruby_version_is "2.5" do
-      it "returns true for the main Thread" do
-        Thread.current.report_on_exception.should == true
-      end
+describe "Thread#report_on_exception" do
+  ruby_version_is "2.5" do
+    it "returns true for the main Thread" do
+      Thread.current.report_on_exception.should == true
+    end
 
-      it "returns true for new Threads" do
-        Thread.new { Thread.current.report_on_exception }.value.should == true
-      end
+    it "returns true for new Threads" do
+      Thread.new { Thread.current.report_on_exception }.value.should == true
     end
+  end
 
-    it "returns whether the Thread will print a backtrace if it exits with an exception" do
-      t = Thread.new { Thread.current.report_on_exception = true }
-      t.join
-      t.report_on_exception.should == true
+  it "returns whether the Thread will print a backtrace if it exits with an exception" do
+    t = Thread.new { Thread.current.report_on_exception = true }
+    t.join
+    t.report_on_exception.should == true
 
-      t = Thread.new { Thread.current.report_on_exception = false }
-      t.join
-      t.report_on_exception.should == false
-    end
+    t = Thread.new { Thread.current.report_on_exception = false }
+    t.join
+    t.report_on_exception.should == false
   end
+end
 
-  describe "Thread#report_on_exception=" do
-    describe "when set to true" do
-      it "prints a backtrace on $stderr if it terminates with an exception" do
-        t = nil
-        -> {
-          t = Thread.new {
-            Thread.current.report_on_exception = true
-            raise RuntimeError, "Thread#report_on_exception specs"
-          }
-          Thread.pass while t.alive?
-        }.should output("", /Thread.+terminated with exception.+Thread#report_on_exception specs/m)
+describe "Thread#report_on_exception=" do
+  describe "when set to true" do
+    it "prints a backtrace on $stderr if it terminates with an exception" do
+      t = nil
+      -> {
+        t = Thread.new {
+          Thread.current.report_on_exception = true
+          raise RuntimeError, "Thread#report_on_exception specs"
+        }
+        Thread.pass while t.alive?
+      }.should output("", /Thread.+terminated with exception.+Thread#report_on_exception specs/m)
+
+      -> {
+        t.join
+      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
+    end
+  end
 
-        -> {
-          t.join
-        }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
-      end
+  describe "when set to false" do
+    it "lets the thread terminates silently with an exception" do
+      t = nil
+      -> {
+        t = Thread.new {
+          Thread.current.report_on_exception = false
+          raise RuntimeError, "Thread#report_on_exception specs"
+        }
+        Thread.pass while t.alive?
+      }.should output("", "")
+
+      -> {
+        t.join
+      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
     end
+  end
 
-    describe "when set to false" do
-      it "lets the thread terminates silently with an exception" do
-        t = nil
-        -> {
-          t = Thread.new {
-            Thread.current.report_on_exception = false
-            raise RuntimeError, "Thread#report_on_exception specs"
-          }
-          Thread.pass while t.alive?
-        }.should output("", "")
+  describe "when used in conjunction with Thread#abort_on_exception" do
+    it "first reports then send the exception back to the main Thread" do
+      t = nil
+      mutex = Mutex.new
+      mutex.lock
+      -> {
+        t = Thread.new {
+          Thread.current.abort_on_exception = true
+          Thread.current.report_on_exception = true
+          mutex.lock
+          mutex.unlock
+          raise RuntimeError, "Thread#report_on_exception specs"
+        }
 
         -> {
-          t.join
+          mutex.sleep(5)
         }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
-      end
-    end
+      }.should output("", /Thread.+terminated with exception.+Thread#report_on_exception specs/m)
 
-    ruby_bug "#13163", "2.4"..."2.5" do
-      describe "when used in conjunction with Thread#abort_on_exception" do
-        it "first reports then send the exception back to the main Thread" do
-          t = nil
-          mutex = Mutex.new
-          mutex.lock
-          -> {
-            t = Thread.new {
-              Thread.current.abort_on_exception = true
-              Thread.current.report_on_exception = true
-              mutex.lock
-              mutex.unlock
-              raise RuntimeError, "Thread#report_on_exception specs"
-            }
-
-            -> {
-              mutex.sleep(5)
-            }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
-          }.should output("", /Thread.+terminated with exception.+Thread#report_on_exception specs/m)
-
-          -> {
-            t.join
-          }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
-        end
-      end
+      -> {
+        t.join
+      }.should raise_error(RuntimeError, "Thread#report_on_exception specs")
     end
   end
 end