From d5ec4aba1b33e284947d521ac6693caea13ca887 Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@soutaro.com>
Date: Thu, 24 Aug 2023 13:07:47 +0000
Subject: [PATCH] Merge pull request #1464 from ruby/fix-ci

Fix CI failure
---
 test/stdlib/Kernel_test.rb |  5 +----
 test/stdlib/test_helper.rb | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/test/stdlib/Kernel_test.rb b/test/stdlib/Kernel_test.rb
index f09f375ac..f1fff5f3e 100644
--- a/test/stdlib/Kernel_test.rb
+++ b/test/stdlib/Kernel_test.rb
@@ -662,7 +662,7 @@ def (obj = BasicObject.new).inspect
   def test_pp
     pp
     pp 1
-    pp 'a', 2 
+    pp 'a', 2
 
     pp Object.new
   end
@@ -704,9 +704,6 @@ def o.divmod(i)
       [0.001, 0.001]
     end
     sleep o
-
-    omit_if(RUBY_VERSION < "3.3.0")
-    sleep nil
   end
 
   def test_syscall
diff --git a/test/stdlib/test_helper.rb b/test/stdlib/test_helper.rb
index 86568b51a..b0f589673 100644
--- a/test/stdlib/test_helper.rb
+++ b/test/stdlib/test_helper.rb
@@ -10,6 +10,17 @@ class Test::Unit::TestCase
   prepend TestSkip
 end
 
+class Test::Unit::TestCase
+  module Printer
+    def setup
+      STDERR.puts name
+      super
+    end
+  end
+
+  # prepend Printer
+end
+
 module Spy
   def self.wrap(object, method_name)
     spy = WrapSpy.new(object: object, method_name: method_name)
@@ -460,7 +471,7 @@ def initialize(*args)
   def to_ary
     @args
   end
-end 
+end
 
 class ToHash
   def initialize(hash = { 'hello' => 'world' })
@@ -578,6 +589,11 @@ def self.hook
               end
   end
 
+  # def setup
+  #   STDERR.puts name
+  #   super
+  # end
+
   def hook
     self.class.hook
   end
@@ -591,9 +607,11 @@ def setup
       null = StringIO.new
       @stdout, @stderr = $stdout, $stderr
       $stderr = $stdout = null
+      super
     end
 
     def teardown
+      super
       $stderr, $stdout = @stderr, @stdout
     end
   end