Fix remaining issues in test/ruby

Author: luke-gruber

test/ruby/test_array.rb

@@ -2023,9 +2023,11 @@ def test_to_h_block
       [[:first_one, :ok], :not_ok].to_h {|k, v| v ? [k, v] : k}
     }
     assert_equal "wrong element type Symbol at 1 (expected array)", e.message
-    array = [1]
-    k = eval("class C\u{1f5ff}; self; end").new
-    assert_raise_with_message(TypeError, /C\u{1f5ff}/) {array.to_h {k}}
+    unless multiple_ractors?
+      array = [1]
+      k = eval("class C\u{1f5ff}; self; end").new
+      assert_raise_with_message(TypeError, /C\u{1f5ff}/) {array.to_h {k}}
+    end
     e = assert_raise(ArgumentError) {
       [[:first_one, :ok], [1, 2], [:not_ok]].to_h {|kv| kv}
     }

test/ruby/test_env.rb

@@ -23,20 +23,19 @@ def assert_invalid_env(msg = nil)
   end
 
   def setup
-    omit "unpredictable results" if multiple_ractors?
+    @multiple_ractors = multiple_ractors? # save because test might mess with ENV
+    omit "unpredictable results" if @multiple_ractors
     @verbose = $VERBOSE
     @backup = ENV.to_hash
     ENV.delete('test')
     ENV.delete('TEST')
   end
 
   def teardown
-    return if multiple_ractors?
-    if @verbose
-      $VERBOSE = @verbose
-      ENV.clear
-      @backup.each {|k, v| ENV[k] = v }
-    end
+    return if @multiple_ractors
+    $VERBOSE = @verbose
+    ENV.clear
+    @backup.each {|k, v| ENV[k] = v }
   end
 
   def test_bracket

test/ruby/test_exception.rb

@@ -1069,32 +1069,31 @@ def test_message_of_name_error
 
   def capture_warning_warn(category: false)
     omit "global side effects" if multiple_ractors?
-    verbose = $VERBOSE
-    categories = Warning.categories.to_h {|cat| [cat, Warning[cat]]}
-    warning = []
+    begin
+      verbose = $VERBOSE
+      categories = Warning.categories.to_h {|cat| [cat, Warning[cat]]}
+      warning = []
 
-    ::Warning.class_eval do
-      alias_method :warn2, :warn
-      remove_method :warn
+      ::Warning.class_eval do
+        alias_method :warn2, :warn
+        remove_method :warn
 
-      if category
-        define_method(:warn) do |str, category: nil|
-          warning << [str, category]
-        end
-      else
-        define_method(:warn) do |str, category: nil|
-          warning << str
+        if category
+          define_method(:warn) do |str, category: nil|
+            warning << [str, category]
+          end
+        else
+          define_method(:warn) do |str, category: nil|
+            warning << str
+          end
         end
       end
-    end
-
-    $VERBOSE = true
-    Warning.categories.each {|cat| Warning[cat] = true}
-    yield
 
-    return warning
-  ensure
-    if verbose
+      $VERBOSE = true
+      Warning.categories.each {|cat| Warning[cat] = true}
+      yield
+      return warning
+    ensure
       $VERBOSE = verbose
       categories.each {|cat, flag| Warning[cat] = flag}
 

test/ruby/test_file.rb

@@ -317,7 +317,7 @@ def test_realdirpath
       assert_equal(File.join(realdir, "foo"), File.realdirpath("foo", tst))
       if main_ractor?
         assert_equal(realdir, Dir.chdir(realdir) {File.realdirpath(".")})
-        assert_equal(File.join(realdir, "foo"), Dir.chdir(realdir) {File.realdirpath("foo")}) if main
+        assert_equal(File.join(realdir, "foo"), Dir.chdir(realdir) {File.realdirpath("foo")})
       end
     }
     begin

test/ruby/test_gc.rb

@@ -352,6 +352,7 @@ def test_latest_gc_info
   end
 
   def test_latest_gc_info_argument
+    omit "racy" if multiple_ractors?
     info = {}
     GC.latest_gc_info(info)