Merge pull request #5470 from rabbitmq/mergify/bp/v3.11.x/pr-5469

Fix failing rabbit_fifo_int test (backport #5469)

1 files changed, 21 insertions, 20 deletions

diff --git a/deps/rabbit/test/rabbit_fifo_int_SUITE.erl b/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
index a8c4f8871f..a50e0ca97a 100644
--- a/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
+++ b/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
@@ -86,10 +86,10 @@ basics(Config) ->
     ClusterName = ?config(cluster_name, Config),
     ServerId = ?config(node_id, Config),
     UId = ?config(uid, Config),
-    CustomerTag = UId,
+    ConsumerTag = UId,
     ok = start_cluster(ClusterName, [ServerId]),
     FState0 = rabbit_fifo_client:init(ClusterName, [ServerId]),
-    {ok, FState1} = rabbit_fifo_client:checkout(CustomerTag, 1, simple_prefetch,
+    {ok, FState1} = rabbit_fifo_client:checkout(ConsumerTag, 1, simple_prefetch,
                                                 #{}, FState0),
 
     rabbit_quorum_queue:wal_force_roll_over(node()),
@@ -97,22 +97,23 @@ basics(Config) ->
     timer:sleep(1000),
 
     {ok, FState2} = rabbit_fifo_client:enqueue(one, FState1),
-    % process ra events
-    FState3 = process_ra_event(FState2, ?RA_EVENT_TIMEOUT),
 
-    FState5 = receive
+    FState4 = receive
                   {ra_event, From, Evt} ->
-                      case rabbit_fifo_client:handle_ra_event(From, Evt, FState3) of
-                          {ok, FState4,
+                      case rabbit_fifo_client:handle_ra_event(From, Evt, FState2) of
+                          {ok, FState3,
                            [{deliver, C, true,
                              [{_Qname, _QRef, MsgId, _SomBool, _Msg}]}]} ->
-                              {S, _A} = rabbit_fifo_client:settle(C, [MsgId], FState4),
+                              {S, _A} = rabbit_fifo_client:settle(C, [MsgId], FState3),
                               S
                       end
               after 5000 ->
                         exit(await_msg_timeout)
               end,
 
+    % process applied event
+    FState5 = process_ra_event(FState4, ?RA_EVENT_TIMEOUT),
+
     % process settle applied notification
     FState5b = process_ra_event(FState5, ?RA_EVENT_TIMEOUT),
     _ = rabbit_quorum_queue:stop_server(ServerId),
@@ -126,20 +127,20 @@ basics(Config) ->
     end,
 
     {ok, FState6} = rabbit_fifo_client:enqueue(two, FState5b),
+    FState8 = receive
+                   {ra_event, Frm, E} ->
+                       case rabbit_fifo_client:handle_ra_event(Frm, E, FState6) of
+                           {ok, FState7, [{deliver, Ctag, true,
+                                           [{_, _, Mid, _, two}]}]} ->
+                               {S2, _A2} = rabbit_fifo_client:return(Ctag, [Mid], FState7),
+                               S2
+                       end
+               after 2000 ->
+                         exit(await_msg_timeout)
+               end,
     % process applied event
-    FState6b = process_ra_event(FState6, ?RA_EVENT_TIMEOUT),
+    _FState9 = process_ra_event(FState8, ?RA_EVENT_TIMEOUT),
 
-    receive
-        {ra_event, Frm, E} ->
-            case rabbit_fifo_client:handle_ra_event(Frm, E, FState6b) of
-                {ok, FState7, [{deliver, Ctag, true,
-                                [{_, _, Mid, _, two}]}]} ->
-                    {_, _} = rabbit_fifo_client:return(Ctag, [Mid], FState7),
-                    ok
-            end
-    after 2000 ->
-              exit(await_msg_timeout)
-    end,
     rabbit_quorum_queue:stop_server(ServerId),
     ok.