Remove silly race.

1 files changed, 12 insertions, 5 deletions

diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index bd11e8bf..7018bffe 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1666,18 +1666,25 @@ test_declare_on_dead_queue(SecondaryNode) ->
                             rabbit_amqqueue:declare(QueueName, false, false, [],
                                                     none),
                         exit(QPid, kill),
-                        Self ! {self(), killed}
+                        Self ! {self(), killed, QPid}
                 end),
     receive
-        {Pid, killed} ->
-            {existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [],
-                                                    none),
-            true = rabbit_misc:is_process_alive(Q#amqqueue.pid),
+        {Pid, killed, OldPid} ->
+            Q = dead_queue_loop(QueueName, OldPid),
             {ok, 0} = rabbit_amqqueue:delete(Q, false, false),
             passed
     after ?TIMEOUT -> throw(failed_to_create_and_kill_queue)
     end.
 
+dead_queue_loop(QueueName, OldPid) ->
+    {existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [], none),
+    case Q#amqqueue.pid of
+        OldPid -> timer:sleep(25),
+                  dead_queue_loop(QueueName, OldPid);
+        _      -> true = rabbit_misc:is_process_alive(Q#amqqueue.pid),
+                  Q
+    end.
+
 %%---------------------------------------------------------------------
 
 control_action(Command, Args) ->