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

@@ -100,7 +100,7 @@ def assert_file
 
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
                             success: nil, failed: nil, **opt)
-        pend "#{__method__}" unless main_ractor?
+        pend "#{__method__}" unless Test::Unit::TestCase.main_ractor?
         args = Array(args).dup
         args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
         stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
@@ -157,7 +157,7 @@ def syntax_check(code, fname, line)
       end
 
       def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)
-        omit "separate process" unless main_ractor?
+        omit "separate process" unless Test::Unit::TestCase.main_ractor?
         # TODO: consider choosing some appropriate limit for RJIT and stop skipping this once it does not randomly fail
         pend 'assert_no_memory_leak may consider RJIT memory usage as leak' if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
         # For previous versions which implemented MJIT
@@ -274,7 +274,7 @@ def assert_valid_syntax(code, *args, **opt)
       end
 
       def assert_normal_exit(testsrc, message = '', child_env: nil, **opt)
-        pend "#{__method__}" unless main_ractor?
+        pend "#{__method__}" unless Test::Unit::TestCase.main_ractor?
         assert_valid_syntax(testsrc, caller_locations(1, 1)[0])
         if child_env
           child_env = [child_env]
@@ -286,7 +286,7 @@ def assert_normal_exit(testsrc, message = '', child_env: nil, **opt)
       end
 
       def assert_ruby_status(args, test_stdin="", message=nil, **opt)
-        pend "#{__method__}" unless main_ractor?
+        pend "#{__method__}" unless Test::Unit::TestCase.main_ractor?
         out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, **opt)
         desc = FailDesc[status, message, out]
         assert(!status.signaled?, desc)
@@ -310,7 +310,7 @@ def separated_runner(token, out = nil)
       end
 
       def assert_separately(args, file = nil, line = nil, src, ignore_stderr: nil, **opt)
-        pend "#{__method__}" unless main_ractor?
+        pend "#{__method__}" unless Test::Unit::TestCase.main_ractor?
         unless file and line
           loc, = caller_locations(1,1)
           file ||= loc.path
@@ -508,7 +508,7 @@ def assert_raise_with_message(exception, expected, msg = nil, &block)
           assert = :assert_match
         end
         ex = m = nil
-        if multiple_ractors?
+        if Test::Unit::TestCase.multiple_ractors?
             ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) do
               yield
             end
@@ -690,7 +690,7 @@ def assert_pattern_list(pattern_list, actual, message=nil)
 
       def assert_warning(pat, msg = nil)
         result = nil
-        if multiple_ractors?
+        if Test::Unit::TestCase.multiple_ractors?
           stderr = EnvUtil.verbose_warning {
             result = yield
           }
@@ -873,7 +873,7 @@ def assert_all_assertions_foreach(msg = nil, *keys, &block)
       # :yield: each elements of +seq+.
       def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n})
         pend "No PERFORMANCE_CLOCK found" unless defined?(PERFORMANCE_CLOCK)
-        pend "Timeout" unless main_ractor?
+        pend "Timeout" unless Test::Unit::TestCase.main_ractor?
 
         # Timeout testing generally doesn't work when RJIT compilation happens.
         rjit_enabled = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?

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