test_all_ractors_multi_ractor: WIP ruby tests passing

Author: luke-gruber

test/ruby/test_array.rb

@@ -660,14 +660,16 @@ def test_concat
     assert_raise(TypeError) { @cls[0].concat(:foo) }
     assert_raise(FrozenError) { @cls[0].freeze.concat(:foo) }
 
-    a = @cls[nil]
-    def (x = Object.new).to_ary
-      ary = Array.new(2)
-      ary << [] << [] << :ok
+    unless multiple_ractors?
+      a = @cls[nil]
+      def (x = Object.new).to_ary
+        ary = Array.new(2)
+        ary << [] << [] << :ok
+      end
+      EnvUtil.under_gc_stress {a.concat(x)}
+      GC.start
+      assert_equal(:ok, a.last)
     end
-    EnvUtil.under_gc_stress {a.concat(x)}
-    GC.start
-    assert_equal(:ok, a.last)
   end
 
   def test_count
@@ -1476,6 +1478,7 @@ def test_replace
   end
 
   def test_replace_wb_variable_width_alloc
+    omit "not working properly across ractors" if multiple_ractors?
     small_embed = []
     4.times { GC.start } # age small_embed
     large_embed = [1, 2, 3, 4, 5, Array.new] # new young object
@@ -2444,11 +2447,13 @@ def test_product
     assert_equal(@cls[], @cls[1,2].product([]))
 
     bug3394 = '[ruby-dev:41540]'
-    acc = []
-    EnvUtil.under_gc_stress {[1,2].product([3,4,5],[6,8]){|array| acc << array}}
-    assert_equal([[1, 3, 6], [1, 3, 8], [1, 4, 6], [1, 4, 8], [1, 5, 6], [1, 5, 8],
-                  [2, 3, 6], [2, 3, 8], [2, 4, 6], [2, 4, 8], [2, 5, 6], [2, 5, 8]],
-                 acc, bug3394)
+    unless multiple_ractors?
+      acc = []
+      EnvUtil.under_gc_stress {[1,2].product([3,4,5],[6,8]){|array| acc << array}}
+      assert_equal([[1, 3, 6], [1, 3, 8], [1, 4, 6], [1, 4, 8], [1, 5, 6], [1, 5, 8],
+                    [2, 3, 6], [2, 3, 8], [2, 4, 6], [2, 4, 8], [2, 5, 6], [2, 5, 8]],
+                  acc, bug3394)
+    end
 
     def (o = Object.new).to_ary; GC.start; [3,4] end
     acc = [1,2].product(*[o]*10)

test/ruby/test_ast.rb

@@ -210,6 +210,7 @@ def test_parse_raises_syntax_error
   end
 
   def test_parse_file_raises_syntax_error
+    omit "Tempfile" unless main_ractor?
     Tempfile.create(%w"test_ast .rb") do |f|
       f.puts "end"
       f.close
@@ -377,6 +378,7 @@ def test_node_id_for_backtrace_location_raises_argument_error
 
   def test_of_proc_and_method
     omit if ParserSupport.prism_enabled? || ParserSupport.prism_enabled_in_subprocess?
+    omit "Tempfile" unless main_ractor?
 
     proc = Proc.new { 1 + 2 }
     method = self.method(__method__)

test/ruby/test_optimization.rb

@@ -1225,6 +1225,7 @@ def test_opt_new_with_safe_navigation
   end
 
   def test_opt_new
+    omit "RubyVM::Iseq.compile/eval not working across multiple ractors" if multiple_ractors?
     pos_initialize = "
       def initialize a, b
         @a = a

tool/lib/test/unit.rb

@@ -1736,8 +1736,8 @@ def _run_suite suite, type
                 ractor_results = []
                 while rs.any?
                   r, obj = Ractor.select(*rs)
-                  _inst, runner, res = *obj
-                  ractor_results << [res, runner]
+                  inst, runner, res = *obj
+                  ractor_results << [res, inst, runner]
                   rs.delete(r)
                 end
                 # ractors done
@@ -1747,11 +1747,12 @@ def _run_suite suite, type
                 self.skips = old_skips
                 self.assertion_count = old_assertion_count
                 self.test_count = old_test_count
-                res = ""
-                ractor_results.each do |(res0, runner)|
-                  res += res0
-                  _merge_results_from_ractor(runner)
+                res = +""
+                ractor_results.each do |(res0, inst, runner)|
+                  res << res0
+                  _merge_results_from_ractor(inst, runner)
                 end
+                inst._assertions = self.assertion_count - old_assertion_count
                 res
               else
                 inst.run self
@@ -1776,13 +1777,13 @@ def _run_suite suite, type
       def __init_runner(runner)
       end
 
-      def _merge_results_from_ractor(runner_cpy)
-        @report += runner_cpy.report
-        @failures += runner_cpy.failures
-        @errors += runner_cpy.errors
-        @skips += runner_cpy.skips
-        @assertion_count += runner_cpy.assertion_count
-        @test_count += runner_cpy.test_count
+      def _merge_results_from_ractor(inst, runner_cpy)
+        self.report += runner_cpy.report
+        self.failures += runner_cpy.failures
+        self.errors += runner_cpy.errors
+        self.skips += runner_cpy.skips
+        self.assertion_count += inst._assertions
+        self.test_count += runner_cpy.test_count
       end
 
       def _start_method(inst)
@@ -1852,7 +1853,8 @@ def _run args = []
         ractors_num = ENV["RUBY_TESTS_WITH_RACTORS"].to_i
 
         if ractors_num > 0
-          puts "\nNOTE: Running tests inside ractors (each test method inside #{ractors_num} ractors)"
+          puts "\nNOTE: Running tests inside ractors (each test method inside #{ractors_num} " \
+            "ractor#{ractors_num > 1 ? 's' : ''})"
         end
 
         self.class.plugins.each do |plugin|

tool/lib/test/unit/testcase.rb

@@ -59,15 +59,18 @@ def non_main_ractor?
         not main_ractor?
       end
 
+      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"]
+        ENV["RUBY_TESTS_WITH_RACTORS"].to_i > 0
       end
 
       def will_run_in_main_ractor?
         not will_run_in_non_main_ractor?
       end
-
     end
 
     ##
@@ -219,8 +222,8 @@ def run_test(name)
         progname, $0 = $0, "#{$0}: #{self.class}##{name}" if main_ractor?
         self.__send__(name)
       ensure
-        $@.delete(RUN_TEST_TRACE) if $@
         if main_ractor?
+          $@.delete(RUN_TEST_TRACE) if $@
           $0 = progname
         end
       end