1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run EnvUtil.apply_timeout_scale outside of assert_separately

Browse Source 
It does not work well in assert_separately
This commit is contained in:
Yusuke Endoh 2022-11-11 07:41:08 +09:00
parent 51d161980a
commit 06e17d7659
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/ruby/test_regexp.rb
View File

@ -1580,9 +1580,8 @@ class TestRegexp < Test::Unit::TestCase
def test_s_timeout
assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
timeout = #{ EnvUtil.apply_timeout_scale(0.2).inspect }
begin;
timeout = EnvUtil.apply_timeout_scale(0.2)
Regexp.timeout = timeout
assert_equal(timeout, Regexp.timeout)
@ -1622,13 +1621,10 @@ class TestRegexp < Test::Unit::TestCase
def per_instance_redos_test(global_timeout, per_instance_timeout, expected_timeout)
assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
global_timeout = #{ global_timeout.inspect }
per_instance_timeout = #{ per_instance_timeout.inspect }
expected_timeout = #{ expected_timeout.inspect }
global_timeout = #{ EnvUtil.apply_timeout_scale(global_timeout).inspect }
per_instance_timeout = #{ (per_instance_timeout ? EnvUtil.apply_timeout_scale(per_instance_timeout) : nil).inspect }
expected_timeout = #{ EnvUtil.apply_timeout_scale(expected_timeout).inspect }
begin;
global_timeout = EnvUtil.apply_timeout_scale(global_timeout)
per_instance_timeout = EnvUtil.apply_timeout_scale(per_instance_timeout)
Regexp.timeout = global_timeout
re = Regexp.new("^(a*)\\1b?a*$", timeout: per_instance_timeout)
@ -1676,8 +1672,8 @@ class TestRegexp < Test::Unit::TestCase
def test_cache_optimization_exponential
assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
timeout = #{ EnvUtil.apply_timeout_scale(2).inspect }
begin;
timeout = EnvUtil.apply_timeout_scale(2)
Regexp.timeout = timeout
assert_nil(/^(a*)*$/ =~ "a" * 1000000 + "x")
@ -1686,8 +1682,8 @@ class TestRegexp < Test::Unit::TestCase
def test_cache_optimization_square
assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
timeout = #{ EnvUtil.apply_timeout_scale(2).inspect }
begin;
timeout = EnvUtil.apply_timeout_scale(2)
Regexp.timeout = timeout
assert_nil(/^a*b?a*$/ =~ "a" * 1000000 + "x")