@@ -80,11 +80,11 @@ def perform
8080 Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
8181 execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
8282
83- Timecop . freeze ( 94 . seconds . after enqueued_time ) do
83+ Timecop . freeze ( 94 . seconds . after ( enqueued_time ) ) do
8484 execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
8585 end
8686
87- Timecop . freeze ( 96 . seconds . after enqueued_time ) do
87+ Timecop . freeze ( 96 . seconds . after ( enqueued_time ) ) do
8888 execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
8989 end
9090 end
@@ -99,89 +99,88 @@ def perform
9999 end
100100
101101 context 'updates the polling interval if config changes' do
102- it 'when changed from the job only' do
103- job = FakeJob . new ( retry_after : [ 20 , 30 ] )
104- TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
102+ it 'when changed from the job only' do
103+ job = FakeJob . new ( retry_after : [ 20 , 30 ] )
104+ TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
105105
106- enqueued_time = Time . now
106+ enqueued_time = Time . now
107+
108+ Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
109+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
110+
111+ Timecop . freeze ( 19 . seconds . after ( enqueued_time ) ) do
112+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
113+ end
107114
108- Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
115+ Timecop . freeze ( 22 . seconds . after ( enqueued_time ) ) do
116+ enqueued_time = Time . now
109117 execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
118+ end
110119
111- Timecop . freeze ( 19 . seconds . after enqueued_time ) do
112- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
113- end
120+ Timecop . freeze ( 29 . seconds . after ( enqueued_time ) ) do
121+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
122+ end
114123
115- Timecop . freeze ( 22 . seconds . after enqueued_time ) do
116- enqueued_time = Time . now
117- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
118- end
124+ Timecop . freeze ( 32 . seconds . after ( enqueued_time ) ) do
125+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
126+ end
127+ end
119128
120- Timecop . freeze ( 29 . seconds . after enqueued_time ) do
121- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
122- end
129+ it 'when default changed after changing from the job' do
130+ job = FakeJob . new ( retry_after : [ 20 ] )
131+ TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
123132
124- Timecop . freeze ( 32 . seconds . after enqueued_time ) do
125- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
126- end
133+ enqueued_time = Time . now
127134
128- end
135+ Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
136+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
129137
130- it 'when default changed after changing from the job' do
131- job = FakeJob . new ( retry_after : [ 20 ] )
132- TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
138+ Timecop . freeze ( 19 . seconds . after ( enqueued_time ) ) do
139+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
140+ end
133141
142+ Timecop . freeze ( 21 . seconds . after ( enqueued_time ) ) do
143+ TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 30
134144 enqueued_time = Time . now
145+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
146+ end
135147
136- Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
148+ Timecop . freeze ( 29 . seconds . after ( enqueued_time ) ) do
149+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
150+ end
151+
152+ Timecop . freeze ( 31 . seconds . after ( enqueued_time ) ) do
137153 execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
154+ end
155+ end
138156
139- Timecop . freeze ( 19 . seconds . after enqueued_time ) do
140- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
141- end
157+ it 'when changing default only' do
158+ job = FakeJob . new
159+ TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
142160
143- Timecop . freeze ( 21 . seconds . after enqueued_time ) do
144- TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 30
145- enqueued_time = Time . now
146- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
147- end
161+ enqueued_time = Time . now
148162
149- Timecop . freeze ( 29 . seconds . after enqueued_time ) do
150- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
151- end
163+ Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
164+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
152165
153- Timecop . freeze ( 31 . seconds . after enqueued_time ) do
154- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
155- end
166+ Timecop . freeze ( 9 . seconds . after ( enqueued_time ) ) do
167+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
156168 end
157169
158- it 'when changing default only' do
159- job = FakeJob . new
160- TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 10
161-
170+ Timecop . freeze ( 11 . seconds . after ( enqueued_time ) ) do
171+ TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 30
162172 enqueued_time = Time . now
163-
164- Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
165173 execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
174+ end
166175
167- Timecop . freeze ( 9 . seconds . after enqueued_time ) do
168- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
169- end
170-
171- Timecop . freeze ( 11 . seconds . after enqueued_time ) do
172- TestConfig . config [ :broker_client_default_async_poll_interval_seconds ] = 30
173- enqueued_time = Time . now
174- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
175- end
176-
177- Timecop . freeze ( 29 . seconds . after enqueued_time ) do
178- execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
179- end
176+ Timecop . freeze ( 29 . seconds . after ( enqueued_time ) ) do
177+ execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
178+ end
180179
181- Timecop . freeze ( 31 . seconds . after enqueued_time ) do
182- execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
183- end
180+ Timecop . freeze ( 31 . seconds . after ( enqueued_time ) ) do
181+ execute_all_jobs ( expected_successes : 1 , expected_failures : 0 )
184182 end
183+ end
185184 end
186185
187186 it 'continues to run until finished' do
@@ -208,7 +207,7 @@ def perform
208207 execute_all_jobs ( expected_successes : 0 , expected_failures : 1 )
209208 expect ( PollableJobModel . first . state ) . to eq ( 'FAILED' )
210209
211- Timecop . freeze ( 61 . seconds . after Time . now ) do
210+ Timecop . freeze ( 61 . seconds . after ( Time . now ) ) do
212211 execute_all_jobs ( expected_successes : 0 , expected_failures : 0 )
213212 end
214213 end
@@ -251,7 +250,7 @@ def handle_timeout
251250
252251 Jobs ::Enqueuer . new ( job , queue : Jobs ::Queues . generic ) . enqueue_pollable
253252
254- Timecop . freeze ( 61 . seconds . after Time . now ) do
253+ Timecop . freeze ( 61 . seconds . after ( Time . now ) ) do
255254 execute_all_jobs ( expected_successes : 0 , expected_failures : 1 , jobs_to_execute : 1 )
256255 expect ( PollableJobModel . first . state ) . to eq ( 'FAILED' )
257256 end
0 commit comments