diff --git a/app/models/solid_queue/recurring_task.rb b/app/models/solid_queue/recurring_task.rb index b5ba67fd..364caef3 100644 --- a/app/models/solid_queue/recurring_task.rb +++ b/app/models/solid_queue/recurring_task.rb @@ -48,7 +48,7 @@ def create_or_update_all(tasks) end def delay_from_now - [ (next_time - Time.current).to_f, 0 ].max + [ (next_time - Time.current).to_f, 0.1 ].max end def next_time diff --git a/test/integration/instrumentation_test.rb b/test/integration/instrumentation_test.rb index d6a039dd..046700d0 100644 --- a/test/integration/instrumentation_test.rb +++ b/test/integration/instrumentation_test.rb @@ -327,7 +327,7 @@ class InstrumentationTest < ActiveSupport::TestCase events = subscribed("enqueue_recurring_task.solid_queue") do schedulers.each(&:start) - sleep 1.01 + wait_while_with_timeout(1.1.second) { SolidQueue::RecurringExecution.count < 2 } schedulers.each(&:stop) end