merge bug25360 into stable

1 files changed, 8 insertions, 1 deletions

diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index a68caadb..7a0ed1af 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1084,9 +1084,16 @@ test_policy_validation() ->
     rabbit_runtime_parameters_test:unregister_policy_validator(),
     passed.
 
+writer() ->
+    receive
+        {'$gen_call', From, flush} -> gen_server:reply(From, ok),
+                                      writer();
+        shutdown -> ok
+    end.
+
 test_server_status() ->
     %% create a few things so there is some useful information to list
-    Writer = spawn(fun () -> receive shutdown -> ok end end),
+    Writer = spawn(fun writer/0),
     {ok, Ch} = rabbit_channel:start_link(
                  1, self(), Writer, self(), "", rabbit_framing_amqp_0_9_1,
                  user(<<"user">>), <<"/">>, [], self(),