aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorKevin Solorio <soloriok@gmail.com>2019-04-30 14:32:03 -0700
committerKevin Solorio <soloriok@gmail.com>2019-04-30 14:32:03 -0700
commitb9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf (patch)
treeeafa11e23849f9aef6c59812494a864ab440fdd0 /activesupport/test
parent681b0c1f2a2a51becad928ff157d59082ce5c1bd (diff)
downloadrails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.tar.gz
rails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.tar.bz2
rails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.zip
revert changes to monotonic times
The change to monotonic times causes failures for applications where the subscribed block is expecting Time objects as described in this issue: https://github.com/rails/rails/issues/36145 The original PR (https://github.com/rails/rails/pull/35984) was concerned with errors on the cpu_time. Test was edited to reflect changes to initializer using 0 values instead of nil
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/notifications_test.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index 0af59764b5..d3c660a014 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -302,7 +302,7 @@ module Notifications
class EventTest < TestCase
def test_events_are_initialized_with_details
- time = Concurrent.monotonic_time
+ time = Time.now
event = event(:foo, time, time + 0.01, random_id, {})
assert_equal :foo, event.name
@@ -310,12 +310,11 @@ module Notifications
assert_in_delta 10.0, event.duration, 0.00001
end
- def test_event_cpu_time_and_idle_time_when_start_and_finish_is_not_called
- time = Concurrent.monotonic_time
+ def test_event_cpu_time_does_not_raise_error_when_start_or_finished_not_called
+ time = Time.now
event = event(:foo, time, time + 0.01, random_id, {})
assert_equal 0, event.cpu_time
- assert_in_delta 10.0, event.idle_time, 0.00001
end