Make the tests work again. Also mirror_pids => extra_pids on the basis that it could be reusable for other purposes

4 files changed, 13 insertions, 9 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 5390bb8600..fd15723178 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -209,7 +209,7 @@ declare(QueueName, Durable, AutoDelete, Args, Owner) ->
                                       arguments       = Args,
                                       exclusive_owner = Owner,
                                       pid             = none,
-                                      mirror_pids     = []}),
+                                      extra_pids      = []}),
     case gen_server2:call(Q#amqqueue.pid, {init, false}) of
         not_found -> rabbit_misc:not_found(QueueName);
         Q1        -> Q1
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index b1ce380b81..40e4edee98 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -116,8 +116,8 @@ check_delivery(_   , _   , {_    , Qs}) -> {routed, Qs}.
 lookup_qpids(QNames) ->
     lists:foldl(fun (QName, QPids) ->
                         case mnesia:dirty_read({rabbit_queue, QName}) of
-                            [#amqqueue{pid = QPid, mirror_pids = Pids}] ->
-                                Pids ++ [QPid | QPids];
+                            [#amqqueue{pid = QPid, extra_pids = EPids}] ->
+                                EPids ++ [QPid | QPids];
                             [] ->
                                 QPids
                         end
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 27e4d925af..a63baddb03 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1848,9 +1848,13 @@ assert_prop(List, Prop, Value) ->
 assert_props(List, PropVals) ->
     [assert_prop(List, Prop, Value) || {Prop, Value} <- PropVals].
 
+test_amqqueue(Durable) ->
+    #amqqueue{name    = test_queue(),
+              durable = Durable}.
+
 with_fresh_variable_queue(Fun) ->
     ok = empty_test_queue(),
-    VQ = rabbit_variable_queue:init(test_queue(), true, false),
+    VQ = rabbit_variable_queue:init(test_amqqueue(true), false),
     S0 = rabbit_variable_queue:status(VQ),
     assert_props(S0, [{q1, 0}, {q2, 0},
                       {delta, {delta, undefined, 0, undefined}},
@@ -2025,7 +2029,7 @@ test_variable_queue_all_the_bits_not_covered_elsewhere1(VQ0) ->
     {VQ5, _AckTags1} = variable_queue_fetch(Count, false, false,
                                             Count, VQ4),
     _VQ6 = rabbit_variable_queue:terminate(VQ5),
-    VQ7 = rabbit_variable_queue:init(test_queue(), true, true),
+    VQ7 = rabbit_variable_queue:init(test_amqqueue(true), true),
     {{_Msg1, true, _AckTag1, Count1}, VQ8} =
         rabbit_variable_queue:fetch(true, VQ7),
     VQ9 = variable_queue_publish(false, 1, VQ8),
@@ -2041,14 +2045,14 @@ test_variable_queue_all_the_bits_not_covered_elsewhere2(VQ0) ->
     VQ4 = rabbit_variable_queue:requeue(AckTags, fun(X) -> X end, VQ3),
     VQ5 = rabbit_variable_queue:idle_timeout(VQ4),
     _VQ6 = rabbit_variable_queue:terminate(VQ5),
-    VQ7 = rabbit_variable_queue:init(test_queue(), true, true),
+    VQ7 = rabbit_variable_queue:init(test_amqqueue(true), true),
     {empty, VQ8} = rabbit_variable_queue:fetch(false, VQ7),
     VQ8.
 
 test_queue_recover() ->
     Count = 2 * rabbit_queue_index:next_segment_boundary(0),
     TxID = rabbit_guid:guid(),
-    {new, #amqqueue { pid = QPid, name = QName }} =
+    {new, #amqqueue { pid = QPid, name = QName } = Q} =
         rabbit_amqqueue:declare(test_queue(), true, false, [], none),
     Msg = rabbit_basic:message(rabbit_misc:r(<<>>, exchange, <<>>),
                                <<>>, #'P_basic'{delivery_mode = 2}, <<>>),
@@ -2071,7 +2075,7 @@ test_queue_recover() ->
               {ok, CountMinusOne, {QName, QPid1, _AckTag, true, _Msg}} =
                   rabbit_amqqueue:basic_get(Q1, self(), false),
               exit(QPid1, shutdown),
-              VQ1 = rabbit_variable_queue:init(QName, true, true),
+              VQ1 = rabbit_variable_queue:init(Q, true),
               {{_Msg1, true, _AckTag1, CountMinusOne}, VQ2} =
                   rabbit_variable_queue:fetch(true, VQ1),
               _VQ3 = rabbit_variable_queue:delete_and_terminate(VQ2),
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 3a0c0925e2..4709532d00 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -137,7 +137,7 @@
                 exclusive_owner :: rabbit_types:maybe(pid()),
                 arguments       :: rabbit_framing:amqp_table(),
                 pid             :: rabbit_types:maybe(pid()),
-                mirror_pids     :: [pid()]}).
+                extra_pids      :: [pid()]}).
 
 -type(exchange() ::
       #exchange{name        :: rabbit_exchange:name(),