1 files changed, 27 insertions, 4 deletions

diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
index 1eb3551e57..82bf2d9d2c 100644
--- a/test/ruby/test_autoload.rb
+++ b/test/ruby/test_autoload.rb
@@ -224,11 +224,18 @@ p Foo::Bar
     Kernel.module_eval do
       alias old_require require
     end
+    Ruby::Box.module_eval do
+      alias old_require require
+    end
     called_with = []
     Kernel.send :define_method, :require do |path|
       called_with << path
       old_require path
     end
+    Ruby::Box.send :define_method, :require do |path|
+      called_with << path
+      old_require path
+    end
     yield called_with
   ensure
     Kernel.module_eval do
@@ -236,6 +243,11 @@ p Foo::Bar
       alias require old_require
       undef old_require
     end
+    Ruby::Box.module_eval do
+      undef require
+      alias require old_require
+      undef old_require
+    end
   end
 
   def test_require_implemented_in_ruby_is_called
@@ -249,7 +261,8 @@ p Foo::Bar
         ensure
           remove_autoload_constant
         end
-        assert_equal [file.path], called_with
+        # .dup to prevent breaking called_with by autoloading pp, etc
+        assert_equal [file.path], called_with.dup
       }
     end
   end
@@ -267,7 +280,8 @@ p Foo::Bar
           ensure
             remove_autoload_constant
           end
-          assert_equal [a.path, b.path], called_with
+          # .dup to prevent breaking called_with by autoloading pp, etc
+          assert_equal [a.path, b.path], called_with.dup
         end
       end
     end
@@ -277,7 +291,6 @@ p Foo::Bar
     # Skip this on macOS 10.13 because of the following error:
     # http://rubyci.s3.amazonaws.com/osx1013/ruby-master/log/20231011T014505Z.fail.html.gz
     require "rbconfig"
-    omit if RbConfig::CONFIG["target_os"] == "darwin17"
 
     script = File.join(__dir__, 'bug-13526.rb')
     assert_ruby_status([script], '', '[ruby-core:81016] [Bug #13526]')
@@ -561,7 +574,7 @@ p Foo::Bar
       autoload_path = File.join(tmpdir, "autoload_parallel_race.rb")
       File.write(autoload_path, 'module Foo; end; module Bar; end')
 
-      assert_separately([], <<-RUBY, timeout: 100)
+      assert_ruby_status([], <<-RUBY, timeout: 100)
         autoload_path = #{File.realpath(autoload_path).inspect}
 
         # This should work with no errors or failures.
@@ -600,4 +613,14 @@ p Foo::Bar
       RUBY
     end
   end
+
+  private
+
+  def assert_separately(*args, **kwargs)
+    super(*args, timeout: 60, **kwargs)
+  end
+
+  def assert_ruby_status(*args, **kwargs)
+    super(*args, timeout: 60, **kwargs)
+  end
 end