Merge pull request #35 from ruby/claude/quirky-tharp-cfbc95

Read RUBY_TEST_TIMEOUT_SCALE in EnvUtil

Author: hsbt

lib/envutil.rb

@@ -81,6 +81,11 @@ def capture_global_values
     self.timeout_scale = 10
   end
 
+  # Read here so that runners other than tool/lib/test/unit.rb, such as
+  # the test-unit gem in test-bundled-gems, also scale timeouts.
+  scale = (ENV["RUBY_TEST_TIMEOUT_SCALE"] || ENV["RUBY_TEST_SUBPROCESS_TIMEOUT_SCALE"]).to_f
+  self.timeout_scale = scale if scale > 0
+
   def apply_timeout_scale(t)
     if scale = EnvUtil.timeout_scale
       t * scale

test/test_envutil.rb

@@ -2,8 +2,11 @@
 
 require "test/unit"
 require "envutil"
+require "core_assertions"
 
 class TestEnvUtil < Test::Unit::TestCase
+  include Test::Unit::CoreAssertions
+
   def test_rubybin_points_to_a_ruby_executable
     assert(File.executable?(EnvUtil.rubybin))
   end
@@ -17,6 +20,10 @@ def test_apply_timeout_scale
     EnvUtil.timeout_scale = original_scale
   end
 
+  def test_timeout_scale_from_env
+    assert_separately([{"RUBY_TEST_TIMEOUT_SCALE" => "2.5"}], "assert_equal(2.5, EnvUtil.timeout_scale)")
+  end
+
   def test_invoke_ruby_captures_output_and_status
     stdout, stderr, status = EnvUtil.invoke_ruby(
       ["-e", "STDOUT.print('out'); STDERR.print('err')"],