Skip to content

Commit fa98a41

Browse files
Revert "Bump a few timeouts in a flakey suite"
This reverts commit fe2b798. The issue turned out to be a legitimate bug in Ra, addressed in rabbitmq/ra@ecb176b.
1 parent 1518d10 commit fa98a41

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

deps/rabbit/test/rabbit_fifo_int_SUITE.erl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ basics(Config) ->
137137
{_, _} = rabbit_fifo_client:return(Ctag, [Mid], FState7),
138138
ok
139139
end
140-
after 5000 ->
140+
after 2000 ->
141141
exit(await_msg_timeout)
142142
end,
143143
rabbit_quorum_queue:stop_server(ServerId),
@@ -172,7 +172,7 @@ rabbit_fifo_returns_correlation(Config) ->
172172
Del ->
173173
exit({unexpected, Del})
174174
end
175-
after 5000 ->
175+
after 2000 ->
176176
exit(await_msg_timeout)
177177
end,
178178
rabbit_quorum_queue:stop_server(ServerId),
@@ -205,7 +205,7 @@ duplicate_delivery(Config) ->
205205
end
206206
end
207207
end
208-
after 5000 ->
208+
after 2000 ->
209209
exit(await_msg_timeout)
210210
end
211211
end,
@@ -224,7 +224,7 @@ usage(Config) ->
224224
{_, _, _} = process_ra_events(receive_ra_events(2, 2), F3),
225225
% force tick and usage stats emission
226226
ServerId ! tick_timeout,
227-
timer:sleep(100),
227+
timer:sleep(50),
228228
Use = rabbit_fifo:usage(element(1, ServerId)),
229229
rabbit_quorum_queue:stop_server(ServerId),
230230
?assert(Use > 0.0),
@@ -306,7 +306,7 @@ returns_after_down(Config) ->
306306
Self ! checkout_done
307307
end),
308308
receive checkout_done -> ok after 1000 -> exit(checkout_done_timeout) end,
309-
timer:sleep(2000),
309+
timer:sleep(1000),
310310
% message should be available for dequeue
311311
{ok, _, {_, _, _, _, msg1}, _} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F2),
312312
rabbit_quorum_queue:stop_server(ServerId),
@@ -325,7 +325,7 @@ resends_after_lost_applied(Config) ->
325325
receive
326326
{ra_event, _, {applied, _}} ->
327327
ok
328-
after 2000 ->
328+
after 500 ->
329329
exit(await_ra_event_timeout)
330330
end,
331331
% send another message
@@ -354,7 +354,7 @@ handles_reject_notification(Config) ->
354354
F0 = rabbit_fifo_client:init(ClusterName, [ServerId2, ServerId1]),
355355
{ok, F1} = rabbit_fifo_client:enqueue(one, F0),
356356

357-
timer:sleep(1000),
357+
timer:sleep(500),
358358

359359
% the applied notification
360360
_F2 = process_ra_events(receive_ra_events(1, 0), F1),
@@ -391,7 +391,7 @@ discard(Config) ->
391391
[msg1] = Letters,
392392
rejected = Reason,
393393
ok
394-
after 1000 ->
394+
after 500 ->
395395
flush(),
396396
exit(dead_letter_timeout)
397397
end,
@@ -456,7 +456,7 @@ untracked_enqueue(Config) ->
456456
ok = start_cluster(ClusterName, [ServerId]),
457457

458458
ok = rabbit_fifo_client:untracked_enqueue([ServerId], msg1),
459-
timer:sleep(500),
459+
timer:sleep(100),
460460
F0 = rabbit_fifo_client:init(ClusterName, [ServerId]),
461461
{ok, _, {_, _, _, _, msg1}, _F5} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F0),
462462
rabbit_quorum_queue:stop_server(ServerId),
@@ -578,7 +578,7 @@ receive_ra_events(Acc) ->
578578
receive
579579
{ra_event, _, _} = Evt ->
580580
receive_ra_events([Evt | Acc])
581-
after 1000 ->
581+
after 500 ->
582582
Acc
583583
end.
584584

0 commit comments

Comments
 (0)