diff options
| author | Nobuyoshi Nakada <[email protected]> | 2023-03-17 15:53:18 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2023-03-18 02:41:02 +0900 |
| commit | ccd2dbc4c15ffb5bde0141a98ec02603c1597243 () | |
| tree | e4d180ba3ccf4c1c04e0e9cb0f0c2f5abda5bd70 | |
| parent | 10e4fa3a0f05f72733d132794cedd08906b40196 (diff) | |
core_assertions.rb: Relax `assert_linear_performance`
* Use an `Enumerable` as factors, instead of three arguments. * Include `assert_operator` time in rehearsal time. * Round up max expected time.
Notes: Merged: https://.com/ruby/ruby/pull/7554
| -rw-r--r-- | test/ruby/test_regexp.rb | 2 | ||||
| -rw-r--r-- | tool/lib/core_assertions.rb | 39 |
2 files changed, 26 insertions, 15 deletions
@@ -1783,7 +1783,7 @@ class TestRegexp < Test::Unit::TestCase def test_linear_performance pre = ->(n) {[Regexp.new("a?" * n + "a" * n), "a" * n]} - assert_linear_performance(factor: 29, first: 10, max: 1, pre: pre) do |re, s| re =~ s end end @@ -738,23 +738,34 @@ eom end alias all_assertions_foreach assert_all_assertions_foreach - def assert_linear_performance(factor: 10_000, first: factor, max: 2, rehearsal: first, pre: ->(n) {n}) - n = first - arg = pre.call(n) - tmax = (0..rehearsal).map do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) - yield arg - (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st) - end.max - - (first >= factor ? 2 : 1).upto(max) do |i| - n = i * factor - t = tmax * factor - arg = pre.call(n) - message = "[#{i}]: #{n} in #{t}s" Timeout.timeout(t, nil, message) do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) - yield arg assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message end end |