Use assert_ruby_status if no assertion

Author: nobu

test/-ext-/tracepoint/test_tracepoint.rb

@@ -83,7 +83,7 @@ def run(hook)
   end
 
   def test_teardown_with_active_GC_end_hook
-    assert_separately([], 'require("-test-/tracepoint"); Bug.after_gc_exit_hook = proc {}; GC.start')
+    assert_ruby_status([], 'require("-test-/tracepoint"); Bug.after_gc_exit_hook = proc {}; GC.start')
   end
 
 end

test/objspace/test_objspace.rb

@@ -143,7 +143,7 @@ def test_reachable_objects_from
   def test_reachable_objects_during_iteration
     omit 'flaky on Visual Studio with: [BUG] Unnormalized Fixnum value' if /mswin/ =~ RUBY_PLATFORM
     opts = %w[--disable-gem --disable=frozen-string-literal -robjspace]
-    assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
+    assert_ruby_status opts, "#{<<-"begin;"}\n#{<<-'end;'}"
     begin;
       ObjectSpace.each_object{|o|
         o.inspect
@@ -179,7 +179,7 @@ def test_reachable_objects_size
   end
 
   def test_trace_object_allocations_stop_first
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    assert_ruby_status([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
       require "objspace"
       # Make sure stopping before the tracepoints are initialized doesn't raise. See [Bug #17020]

test/openssl/test_fips.rb

@@ -30,7 +30,7 @@ def test_fips_mode_get_is_false_on_fips_mode_disabled
   def test_fips_mode_is_reentrant
     return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
 
-    assert_separately(["-ropenssl"], <<~"end;")
+    assert_ruby_status(["-ropenssl"], <<~"end;")
       OpenSSL.fips_mode = false
       OpenSSL.fips_mode = false
     end;

test/ripper/assert_parse_files.rb

@@ -40,6 +40,7 @@ class Parser < Ripper
           end
         }
       end
+      assert(true) if scripts.empty?
     end;
   end
 end

test/ruby/test_autoload.rb

@@ -574,7 +574,7 @@ def test_autoload_parallel_race
       autoload_path = File.join(tmpdir, "autoload_parallel_race.rb")
       File.write(autoload_path, 'module Foo; end; module Bar; end')
 
-      assert_separately([], <<-RUBY, timeout: 100)
+      assert_ruby_status([], <<-RUBY, timeout: 100)
         autoload_path = #{File.realpath(autoload_path).inspect}
 
         # This should work with no errors or failures.
@@ -617,6 +617,10 @@ module SomeNamespace
   private
 
   def assert_separately(*args, **kwargs)
-    super(*args, **{ timeout: 60 }.merge(kwargs))
+    super(*args, timeout: 60, **kwargs)
+  end
+
+  def assert_ruby_status(*args, **kwargs)
+    super(*args, timeout: 60, **kwargs)
   end
 end

test/ruby/test_gc_compact.rb

@@ -364,7 +364,7 @@ def add_ivars
   def test_compact_objects_of_varying_sizes
     omit if GC::INTERNAL_CONSTANTS[:SIZE_POOL_COUNT] == 1
 
-    assert_separately([], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
+    assert_ruby_status([], "#{<<~"begin;"}\n#{<<~"end;"}", timeout: 10)
     begin;
       $objects = []
       160.times do |n|

test/ruby/test_lambda.rb

@@ -163,7 +163,7 @@ def self.b
   end
 
   def test_proc_inside_lambda_toplevel
-    assert_separately [], <<~RUBY
+    assert_ruby_status [], <<~RUBY
       lambda{
         $g = proc{ return :pr }
       }.call

test/ruby/test_module.rb

@@ -583,7 +583,7 @@ def b; 2 end
   end
 
   def test_gc_prepend_chain
-    assert_separately([], <<-EOS)
+    assert_ruby_status([], <<-EOS)
       10000.times { |i|
         m1 = Module.new do
           def foo; end
@@ -3073,7 +3073,7 @@ def test_return_value_of_define_singleton_method
   end
 
   def test_prepend_gc
-    assert_separately [], %{
+    assert_ruby_status [], %{
       module Foo
       end
       class Object

test/ruby/test_optimization.rb

@@ -946,14 +946,14 @@ def foo &b
   end
 
   def test_peephole_optimization_without_trace
-    assert_separately [], <<-END
+    assert_ruby_status [], <<-END
       RubyVM::InstructionSequence.compile_option = {trace_instruction: false}
       eval "def foo; 1.times{|(a), &b| nil && a}; end"
     END
   end
 
   def test_clear_unreachable_keyword_args
-    assert_separately [], <<-END, timeout: 60
+    assert_ruby_status [], <<-END, timeout: 60
       script =  <<-EOS
         if true
         else

test/ruby/test_process.rb

@@ -1996,7 +1996,7 @@ def test_popen_exit
   end
 
   def test_popen_reopen
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    assert_ruby_status([], "#{<<~"begin;"}\n#{<<~'end;'}")
     begin;
       io = File.open(IO::NULL)
       io2 = io.dup
@@ -2387,7 +2387,7 @@ def test_clock_getres_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC
   end
 
   def test_deadlock_by_signal_at_forking
-    assert_separately(%W(- #{RUBY}), <<-INPUT, timeout: 100)
+    assert_ruby_status(%W(- #{RUBY}), <<-INPUT, timeout: 100)
       ruby = ARGV.shift
       GC.start # reduce garbage
       GC.disable # avoid triggering CoW after forks