Fix more tests for test-all with multiple ractors

Author: luke-gruber

test/ruby/test_basicinstructions.rb

@@ -10,7 +10,7 @@ class Class
 class TestBasicInstructions < Test::Unit::TestCase
 
   def setup
-    omit "Lots of unfrozen strings in constants" if non_main_ractor?
+    omit "Lots of unfrozen strings in constants" unless main_ractor?
   end
 
   def test_immediates

test/ruby/test_beginendblock.rb

@@ -167,7 +167,7 @@ def test_errinfo_at_exit
 
   if defined?(fork)
     def test_internal_errinfo_at_exit
-      omit "at_exit handlers cannot use ractor-local objects" if non_main_ractor?
+      omit "fork" unless main_ractor?
       # TODO: use other than break-in-fork to throw an internal
       # error info.
       error, pid, status = IO.pipe do |r, w|

test/ruby/test_enumerator.rb

@@ -496,10 +496,12 @@ def test_generator
 
     assert_raise(LocalJumpError) {Enumerator::Generator.new}
     assert_raise(TypeError) {Enumerator::Generator.new(1)}
-    obj = eval("class C\u{1f5ff}; self; end").new
-    assert_raise_with_message(TypeError, /C\u{1f5ff}/) {
-      Enumerator::Generator.new(obj)
-    }
+    unless multiple_ractors?
+      obj = eval("class C\u{1f5ff}; self; end").new
+      assert_raise_with_message(TypeError, /C\u{1f5ff}/) {
+        Enumerator::Generator.new(obj)
+      }
+    end
   end
 
   def test_generator_args

test/ruby/test_file_exhaustive.rb

@@ -928,17 +928,19 @@ def test_expand_path_encoding
 
   def test_expand_path_encoding_filesystem
     omit "global side effects" if multiple_ractors?
-    home = ENV["HOME"]
-    ENV["HOME"] = "#{DRIVE}/UserHome"
+    begin
+      home = ENV["HOME"]
+      ENV["HOME"] = "#{DRIVE}/UserHome"
 
-    path = "~".encode("US-ASCII")
-    dir = "C:/".encode("IBM437")
-    fs = Encoding.find("filesystem")
+      path = "~".encode("US-ASCII")
+      dir = "C:/".encode("IBM437")
+      fs = Encoding.find("filesystem")
 
-    assert_equal fs, File.expand_path(path).encoding
-    assert_equal fs, File.expand_path(path, dir).encoding
-  ensure
-    ENV["HOME"] = home if home
+      assert_equal fs, File.expand_path(path).encoding
+      assert_equal fs, File.expand_path(path, dir).encoding
+    ensure
+      ENV["HOME"] = home
+    end
   end
 
   UnknownUserHome = "~foo_bar_baz_unknown_user_wahaha".freeze
@@ -963,31 +965,31 @@ def test_expand_path_home
       ENV["HOME"] = "."
       assert_raise(ArgumentError, bug3630) { File.expand_path("~") }
     ensure
-      if home
-        ENV["HOME"] = home
-        ENV["HOMEDRIVE"] = home_drive
-        ENV["HOMEPATH"] = home_path
-        ENV["USERPROFILE"] = user_profile
-      end
+      ENV["HOME"] = home
+      ENV["HOMEDRIVE"] = home_drive
+      ENV["HOMEPATH"] = home_path
+      ENV["USERPROFILE"] = user_profile
     end
   end
 
   def test_expand_path_home_dir_string
     omit "global side effects" if multiple_ractors?
-    home = ENV["HOME"]
-    new_home = "#{DRIVE}/UserHome"
-    ENV["HOME"] = new_home
-    bug8034 = "[ruby-core:53168]"
-
-    assert_equal File.join(new_home, "foo"), File.expand_path("foo", "~"), bug8034
-    assert_equal File.join(new_home, "bar", "foo"), File.expand_path("foo", "~/bar"), bug8034
-
-    assert_raise(ArgumentError) { File.expand_path(".", UnknownUserHome) }
-    assert_nothing_raised(ArgumentError) { File.expand_path("#{DRIVE}/", UnknownUserHome) }
-    ENV["HOME"] = "#{DRIVE}UserHome"
-    assert_raise(ArgumentError) { File.expand_path("~") }
-  ensure
-    ENV["HOME"] = home if home
+    begin
+      home = ENV["HOME"]
+      new_home = "#{DRIVE}/UserHome"
+      ENV["HOME"] = new_home
+      bug8034 = "[ruby-core:53168]"
+
+      assert_equal File.join(new_home, "foo"), File.expand_path("foo", "~"), bug8034
+      assert_equal File.join(new_home, "bar", "foo"), File.expand_path("foo", "~/bar"), bug8034
+
+      assert_raise(ArgumentError) { File.expand_path(".", UnknownUserHome) }
+      assert_nothing_raised(ArgumentError) { File.expand_path("#{DRIVE}/", UnknownUserHome) }
+      ENV["HOME"] = "#{DRIVE}UserHome"
+      assert_raise(ArgumentError) { File.expand_path("~") }
+    ensure
+      ENV["HOME"] = home
+    end
   end
 
   if /mswin|mingw/ =~ RUBY_PLATFORM
@@ -1110,33 +1112,39 @@ def test_expand_path_converts_a_pathname_which_starts_with_a_slash_using_a_curre
 
   def test_expand_path_converts_a_pathname_to_an_absolute_pathname_using_home_as_base
     omit "global side effects" if multiple_ractors?
-    old_home = ENV["HOME"]
-    home = ENV["HOME"] = "#{DRIVE}/UserHome"
-    assert_equal(home, File.expand_path("~"))
-    assert_equal(home, File.expand_path("~", "C:/FooBar"))
-    assert_equal(File.join(home, "a"), File.expand_path("~/a", "C:/FooBar"))
-  ensure
-    ENV["HOME"] = old_home if old_home
+    begin
+      old_home = ENV["HOME"]
+      home = ENV["HOME"] = "#{DRIVE}/UserHome"
+      assert_equal(home, File.expand_path("~"))
+      assert_equal(home, File.expand_path("~", "C:/FooBar"))
+      assert_equal(File.join(home, "a"), File.expand_path("~/a", "C:/FooBar"))
+    ensure
+      ENV["HOME"] = old_home
+    end
   end
 
   def test_expand_path_converts_a_pathname_to_an_absolute_pathname_using_unc_home
     omit "global side effects" if multiple_ractors?
-    old_home = ENV["HOME"]
-    unc_home = ENV["HOME"] = "//UserHome"
-    assert_equal(unc_home, File.expand_path("~"))
-  ensure
-    ENV["HOME"] = old_home if old_home
+    begin
+      old_home = ENV["HOME"]
+      unc_home = ENV["HOME"] = "//UserHome"
+      assert_equal(unc_home, File.expand_path("~"))
+    ensure
+      ENV["HOME"] = old_home
+    end
   end if DRIVE
 
   def test_expand_path_does_not_modify_a_home_string_argument
     omit "global side effects" if multiple_ractors?
-    old_home = ENV["HOME"]
-    home = ENV["HOME"] = "#{DRIVE}/UserHome"
-    str = "~/a"
-    assert_equal("#{home}/a", File.expand_path(str))
-    assert_equal("~/a", str)
-  ensure
-    ENV["HOME"] = old_home if old_home
+    begin
+      old_home = ENV["HOME"]
+      home = ENV["HOME"] = "#{DRIVE}/UserHome"
+      str = "~/a"
+      assert_equal("#{home}/a", File.expand_path(str))
+      assert_equal("~/a", str)
+    ensure
+      ENV["HOME"] = old_home
+    end
   end
 
   def test_expand_path_raises_argument_error_for_any_supplied_username
@@ -1157,11 +1165,13 @@ def test_expand_path_error_for_nonexistent_username
 
   def test_expand_path_error_for_non_absolute_home
     omit "global side effects" if multiple_ractors?
-    old_home = ENV["HOME"]
-    ENV["HOME"] = "./UserHome"
-    assert_raise_with_message(ArgumentError, /non-absolute home/) {File.expand_path("~")}
-  ensure
-    ENV["HOME"] = old_home if old_home
+    begin
+      old_home = ENV["HOME"]
+      ENV["HOME"] = "./UserHome"
+      assert_raise_with_message(ArgumentError, /non-absolute home/) {File.expand_path("~")}
+    ensure
+      ENV["HOME"] = old_home
+    end
   end
 
   def test_expand_path_raises_a_type_error_if_not_passed_a_string_type

test/ruby/test_io.rb

@@ -702,6 +702,7 @@ def test_copy_stream_file_to_pipe
   if have_nonblock?
     def test_copy_stream_no_busy_wait
       omit "multiple threads already active" if Thread.list.size > 1
+      omit "unpredictable" unless main_ractor?
 
       msg = 'r58534 [ruby-core:80969] [Backport #13533]'
       IO.pipe do |r,w|

test/ruby/test_method.rb

@@ -1580,6 +1580,7 @@ def m2
   end)
 
   def test_method_in_method_visibility_should_be_public
+    omit "racy" if multiple_ractors?
     MethodInMethodClass_Setup.call
 
     assert_equal([:m1].sort, MethodInMethodClass.public_instance_methods(false).sort)

test/ruby/test_shapes.rb

@@ -126,7 +126,7 @@ def test_too_complex
   end
 
   def test_ordered_alloc_is_not_complex
-    pend "ObjectSpace.dump" if non_main_ractor?
+    pend "ObjectSpace.dump" unless main_ractor?
     5.times { OrderedAlloc.new.add_ivars }
     obj = JSON.parse(ObjectSpace.dump(OrderedAlloc))
     assert_operator obj["variation_count"], :<, RubyVM::Shape::SHAPE_MAX_VARIATIONS
@@ -180,7 +180,7 @@ def test_removing_when_too_many_ivs_on_class
 
   def test_removing_when_too_many_ivs_on_module
     # could be safe due to not having a constant attached
-    pend "module ivars" if non_main_ractor?
+    pend "module ivars" unless main_ractor?
     obj = Module.new
 
     (MANY_IVS + 2).times do

test/ruby/test_signal.rb

@@ -4,8 +4,12 @@
 require 'tempfile'
 
 class TestSignal < Test::Unit::TestCase
+
+  def setup
+    omit "racy" unless main_ractor?
+  end
+
   def test_signal
-    omit "signals run in main ractor" if non_main_ractor?
     begin
       x = 0
       oldtrap = Signal.trap(:INT) {|sig| x = 2 }
@@ -27,7 +31,6 @@ def test_signal
   end if Process.respond_to?(:kill)
 
   def test_signal_process_group
-    omit "Process.spawn" unless main_ractor?
     bug4362 = '[ruby-dev:43169]'
     assert_nothing_raised(bug4362) do
       cmd = [ EnvUtil.rubybin, '--disable=gems' '-e', 'sleep 10' ]
@@ -41,7 +44,6 @@ def test_signal_process_group
     Process.respond_to?(:pgroup) # for mswin32
 
   def test_exit_action
-    pend "Timeout" if non_main_ractor?
     if Signal.list[sig = "USR1"]
       term = :TERM
     else
@@ -100,7 +102,6 @@ def test_interrupt
   end
 
   def test_signal2
-    pend "Timeout" if non_main_ractor?
     begin
       x = false
       oldtrap = Signal.trap(:INT) {|sig| x = true }
@@ -136,7 +137,6 @@ def o.to_str; "SIGINT"; end
   end if Process.respond_to?(:kill)
 
   def test_trap
-    omit "not ractor safe" unless main_ractor?
     begin
       oldtrap = Signal.trap(:INT) {|sig| }
 
@@ -265,7 +265,6 @@ def test_trap_puts
   end if Process.respond_to?(:kill)
 
   def test_hup_me
-    pend "Timeout" if non_main_ractor?
     # [Bug #7951] [ruby-core:52864]
     # This is MRI specific spec. ruby has no guarantee
     # that signal will be deliverd synchronously.
@@ -318,7 +317,6 @@ def test_signal_list_dedupe_keys
   def test_self_stop
     omit unless Process.respond_to?(:fork)
     omit unless defined?(Process::WUNTRACED)
-    omit "fork" unless main_ractor?
 
     # Make a process that stops itself
     child_pid = fork do

test/ruby/test_thread_cv.rb

@@ -137,6 +137,7 @@ def test_condvar_wait_deadlock_2
   end
 
   def test_condvar_timed_wait
+    omit "unpredictable" if multiple_ractors?
     mutex = Thread::Mutex.new
     condvar = Thread::ConditionVariable.new
     timeout = 0.3