From 2982464a8e3f07e769d8d6eb0fd70b01c168a962 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 13 Sep 2021 10:54:24 +0900
Subject: [PATCH] Revert "Resolved conflict initializers"

  This reverts commit 62db6e47b6c0fbba337649bfa468ec221d5d1001.

  308183fffab43f1e111d5bb4c60f1380432966e6 is the correct solution
  about this.
---
 tool/lib/test/unit.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 6e4b643ad8..bfa1964963 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -80,12 +80,6 @@ module Test
     module Options # :nodoc: all
       def initialize(*, &block)
         @init_hook = block
-        @report = []
-        @errors = @failures = @skips = 0
-        @verbose = false
-        @mutex = Thread::Mutex.new
-        @info_signal = Signal.list['INFO']
-        @repeat_count = nil
         @options = nil
         super(&nil)
       end
@@ -1433,6 +1427,19 @@ module Test
         last_before_assertion.sub(/:in .*$/, '')
       end
 
+      ##
+      # Writes status for failed test +meth+ in +klass+ which finished with
+      # exception +e+
+
+      def initialize # :nodoc:
+        @report = []
+        @errors = @failures = @skips = 0
+        @verbose = false
+        @mutex = Thread::Mutex.new
+        @info_signal = Signal.list['INFO']
+        @repeat_count = nil
+      end
+
       def synchronize # :nodoc:
         if @mutex then
           @mutex.synchronize { yield }