yet another attempt to reduce timeouts in CI

- catch surplus eagerly
- wait longer for confirms, wait shorter for any surplus

1 files changed, 6 insertions, 6 deletions

diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index bfae0b06df..bd89d54daf 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1704,6 +1704,8 @@ on_disk_capture() ->
         stop                 -> done
     end.
 
+on_disk_capture([_|_], _Awaiting, Pid) ->
+    Pid ! {self(), surplus};
 on_disk_capture(OnDisk, Awaiting, Pid) ->
     receive
         {on_disk, MsgIdsS} ->
@@ -1712,12 +1714,10 @@ on_disk_capture(OnDisk, Awaiting, Pid) ->
                             Pid);
         stop ->
             done
-    after 500 ->
-            case {OnDisk, Awaiting} of
-                {[], []} -> Pid ! {self(), arrived}, on_disk_capture();
-                {_,  []} -> Pid ! {self(), surplus};
-                {[],  _} -> Pid ! {self(), timeout};
-                {_,   _} -> Pid ! {self(), surplus_timeout}
+    after (case Awaiting of [] -> 200; _ -> 1000 end) ->
+            case Awaiting of
+                [] -> Pid ! {self(), arrived}, on_disk_capture();
+                _  -> Pid ! {self(), timeout}
             end
     end.