Fix remaining issues in test/ruby

Author: luke-gruber

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_time_tz.rb

@@ -572,7 +572,7 @@ def self.gen_variational_zdump_test(hint, data)
     }
   end
 
-  unless will_run_in_non_main_ractor?
+  if will_run_in_main_ractor?
     # tzdata-2014g fixed the offset for lisbon from -0:36:32 to -0:36:45.
     # [ruby-core:65058] [Bug #10245]
     gen_variational_zdump_test "lisbon", <<'End' if has_lisbon_tz

tool/lib/core_assertions.rb

@@ -508,7 +508,8 @@ def assert_raise_with_message(exception, expected, msg = nil, &block)
           assert = :assert_match
         end
         ex = m = nil
-        if multiple_ractors?
+        # defined check so CoreAssertions has no hard dependency on Guard module
+        if defined?(multiple_ractors?) && multiple_ractors?
             ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) do
               yield
             end
@@ -690,7 +691,7 @@ def assert_pattern_list(pattern_list, actual, message=nil)
 
       def assert_warning(pat, msg = nil)
         result = nil
-        if multiple_ractors?
+        if defined?(multiple_ractors?) && multiple_ractors?
           stderr = EnvUtil.verbose_warning {
             result = yield
           }

tool/lib/test/unit/testcase.rb

@@ -63,13 +63,9 @@ def multiple_ractors?
         ENV["RUBY_TESTS_WITH_RACTORS"].to_i > 1
       end
 
-      # In order to guard generating methods dynamically that will run inside a ractor
-      def will_run_in_non_main_ractor?
-        ENV["RUBY_TESTS_WITH_RACTORS"].to_i > 0
-      end
-
+      # In order to guard generating methods dynamically that will run inside another ractor
       def will_run_in_main_ractor?
-        not will_run_in_non_main_ractor?
+        ENV["RUBY_TESTS_WITH_RACTORS"].to_i == 0
       end
     end