[GR-48376] Increase specs timeout and TimeoutAction improvements

PullRequest: truffleruby/4052

Author: eregon

spec/mspec/lib/mspec/runner/actions/timeout.rb

@@ -48,11 +48,12 @@ def start
 
               show_backtraces
               if MSpec.subprocesses.empty?
-                exit 2
+                exit! 2
               else
                 # Do not exit but signal the subprocess so we can get their output
                 MSpec.subprocesses.each do |pid|
-                  Process.kill :SIGTERM, pid
+                  kill_wait_one_second :SIGTERM, pid
+                  hard_kill :SIGKILL, pid
                 end
                 @fail = true
                 @current_state = nil
@@ -80,7 +81,7 @@ def after(state = nil)
 
     if @fail
       STDERR.puts "\n\nThe last example #{@error_message}. See above for the subprocess stacktrace."
-      exit 2
+      exit! 2
     end
   end
 
@@ -89,12 +90,28 @@ def finish
     @thread.join
   end
 
+  private def hard_kill(signal, pid)
+    begin
+      Process.kill signal, pid
+    rescue Errno::ESRCH
+      # Process already terminated
+    end
+  end
+
+  private def kill_wait_one_second(signal, pid)
+    begin
+      Process.kill signal, pid
+      sleep 1
+    rescue Errno::ESRCH
+      # Process already terminated
+    end
+  end
+
   private def show_backtraces
     java_stacktraces = -> pid {
       if RUBY_ENGINE == 'truffleruby' || RUBY_ENGINE == 'jruby'
         STDERR.puts 'Java stacktraces:'
-        Process.kill :SIGQUIT, pid
-        sleep 1
+        kill_wait_one_second :SIGQUIT, pid
       end
     }
 
@@ -118,8 +135,7 @@ def finish
 
         if RUBY_ENGINE == 'truffleruby'
           STDERR.puts "\nRuby backtraces:"
-          Process.kill :SIGALRM, pid
-          sleep 1
+          kill_wait_one_second :SIGALRM, pid
         else
           STDERR.puts "Don't know how to print backtraces of a subprocess on #{RUBY_ENGINE}"
         end

spec/truffle/thread/status_spec.rb

@@ -29,11 +29,15 @@
       regexp =~ string
     end
 
+    saw_status = false
     while status = t.status
+      saw_status = true
       status.should == "run"
       Thread.pass
     end
     t.join
+
+    skip 'unfair scheduling' unless saw_status
   end
 
 end

test/mri/tests/lib/envutil.rb

@@ -61,8 +61,10 @@ def capture_global_values
     end
   end
 
-  # TruffleRuby: startup can take longer, especially on highly loaded CI machines
-  self.timeout_scale = 3 if defined?(::TruffleRuby)
+  # TruffleRuby: startup can take longer, especially on highly loaded CI machines.
+  # Note that EnvUtil.invoke_ruby has a timeout of 10 seconds * the scale.
+  # We use 60 * 10 = 600s which is the same as the timeout for ruby/spec in jt.rb.
+  self.timeout_scale = 60 if defined?(::TruffleRuby)
 
   def apply_timeout_scale(t)
     if scale = EnvUtil.timeout_scale

tool/jt.rb

@@ -1682,7 +1682,7 @@ def mspec(*args)
       options += %w[--excl-tag slow]
     end
 
-    options += %w[--timeout 300] if ci?
+    options += %w[--timeout 600] if ci?
 
     args, ruby_args = args_split(args)
     vm_args, ruby_args, parsed_options = ruby_options({}, ['--reveal', *ruby_args])