@@ -2423,11 +2423,21 @@ confirm_availability_on_leader_change(Config) ->
24232423 ok .
24242424
24252425wait_for_new_messages (Config , Node , Name , Increase ) ->
2426+ wait_for_new_messages (Config , Node , Name , Increase , 60000 ).
2427+
2428+ wait_for_new_messages (Config , Node , Name , Increase , Timeout ) ->
24262429 Infos = rabbit_ct_broker_helpers :rabbitmqctl_list (
24272430 Config , Node , [" list_queues" , " name" , " messages" ]),
2428- [[Name , Msgs0 ]] = [Props || Props <- Infos , hd (Props ) == Name ],
2429- Msgs = binary_to_integer (Msgs0 ),
2430- queue_utils :wait_for_min_messages (Config , Name , Msgs + Increase ).
2431+ case [Props || Props <- Infos , hd (Props ) == Name ] of
2432+ [[Name , Msgs0 ]] ->
2433+ Msgs = binary_to_integer (Msgs0 ),
2434+ queue_utils :wait_for_min_messages (Config , Name , Msgs + Increase );
2435+ _ when Timeout >= 0 ->
2436+ Sleep = 200 ,
2437+ timer :sleep (Sleep ),
2438+ wait_for_new_messages (
2439+ Config , Node , Name , Increase , Timeout - Sleep )
2440+ end .
24312441
24322442flush (T ) ->
24332443 receive X ->
0 commit comments