summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-06-26 15:04:19 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-06-26 15:04:19 +0300
commitbd3c18963f68e36ca554cd782e72def1343efae3 (patch)
treee70ad44abbad8e2aea05a7a2af42e1e457334c97 /test
parentb76bd6d6530b53324eb50e31380f7bd462869417 (diff)
downloadrabbitmq-server-git-bd3c18963f68e36ca554cd782e72def1343efae3.tar.gz
Avoid using unfortunate terms in more places
We have switched all doc guides to use "mirror" or "secondary" years ago but these were never updated. Renaming functions and record/HTTP API fields (including CLI tools) would be major a breaking change, so they will be aliased or renamed with a lot more extensive review in the future.
Diffstat (limited to 'test')
-rw-r--r--test/dynamic_ha_SUITE.erl2
-rw-r--r--test/priority_queue_SUITE.erl4
-rw-r--r--test/sync_detection_SUITE.erl10
-rwxr-xr-xtest/temp/rabbitmqadmin.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl
index 15770ca41f..f594683782 100644
--- a/test/dynamic_ha_SUITE.erl
+++ b/test/dynamic_ha_SUITE.erl
@@ -439,7 +439,7 @@ nodes_policy_should_pick_master_from_its_params(Config) ->
Info = find_queue(?QNAME, A),
SSPids = proplists:get_value(synchronised_slave_pids, Info),
- %% Choose slave that isn't the first sync slave. Cover a bug that always
+ %% Choose mirror that isn't the first sync slave. Cover a bug that always
%% chose the first, even if it was not part of the policy
LastSlave = node(lists:last(SSPids)),
?assertEqual(true, apply_policy_to_declared_queue(Config, Ch, [A],
diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl
index 8a2e53a06d..97381fd61c 100644
--- a/test/priority_queue_SUITE.erl
+++ b/test/priority_queue_SUITE.erl
@@ -447,7 +447,7 @@ mirror_queue_sync(Config) ->
ok = rabbit_ct_broker_helpers:set_ha_policy(Config, 0,
<<"^mirror_queue_sync-queue$">>, <<"all">>),
publish(Ch, Q, [1, 2, 3, 1, 2, 3]),
- %% master now has 9, slave 6.
+ %% master now has 9, mirror 6.
get_partial(Ch, Q, manual_ack, [3, 3, 3, 2, 2, 2]),
%% So some but not all are unacked at the slave
Nodename0 = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
@@ -519,7 +519,7 @@ mirror_queue_auto_ack(Config) ->
%% Restart one of the mirrors so `request_depth` is triggered
rabbit_ct_broker_helpers:restart_node(Config, SNode1),
- %% The alive slave must have the same pid after its neighbour is restarted
+ %% The alive mirror must have the same pid after its neighbour is restarted
timer:sleep(3000), %% ugly but we can't know when the `depth` instruction arrives
Slaves = nodes_and_pids(slave_pids(Config, A, rabbit_misc:r(<<"/">>, queue, Q))),
SPid2 = proplists:get_value(SNode2, Slaves),
diff --git a/test/sync_detection_SUITE.erl b/test/sync_detection_SUITE.erl
index 47fa9d6013..6041218268 100644
--- a/test/sync_detection_SUITE.erl
+++ b/test/sync_detection_SUITE.erl
@@ -98,9 +98,9 @@ slave_synchronization(Config) ->
%% the master.
rabbit_ct_broker_helpers:stop_broker(Config, Slave),
- %% We get and ack one message when the slave is down, and check that when we
- %% start the slave it's not marked as synced until ack the message. We also
- %% publish another message when the slave is up.
+ %% We get and ack one message when the mirror is down, and check that when we
+ %% start the mirror it's not marked as synced until ack the message. We also
+ %% publish another message when the mirror is up.
send_dummy_message(Channel, Queue), % 1 - 0
{#'basic.get_ok'{delivery_tag = Tag1}, _} =
amqp_channel:call(Channel, #'basic.get'{queue = Queue}), % 0 - 1
@@ -115,7 +115,7 @@ slave_synchronization(Config) ->
slave_synced(Master, Queue),
- %% We restart the slave and we send a message, so that the slave will only
+ %% We restart the mirror and we send a message, so that the mirror will only
%% have one of the messages.
rabbit_ct_broker_helpers:stop_broker(Config, Slave),
rabbit_ct_broker_helpers:start_broker(Config, Slave),
@@ -124,7 +124,7 @@ slave_synchronization(Config) ->
slave_unsynced(Master, Queue),
- %% We reject the message that the slave doesn't have, and verify that it's
+ %% We reject the message that the mirror doesn't have, and verify that it's
%% still unsynced
{#'basic.get_ok'{delivery_tag = Tag2}, _} =
amqp_channel:call(Channel, #'basic.get'{queue = Queue}), % 1 - 1
diff --git a/test/temp/rabbitmqadmin.py b/test/temp/rabbitmqadmin.py
index 525fc379bf..bb4ed118b7 100755
--- a/test/temp/rabbitmqadmin.py
+++ b/test/temp/rabbitmqadmin.py
@@ -673,7 +673,7 @@ class Lister:
if depth < max_depth:
add(column, depth + 1, subitem, fun)
elif type(subitem) == list:
- # The first branch has slave nodes in queues in
+ # The first branch has mirror nodes in queues in
# mind (which come out looking decent); the second
# one has applications in nodes (which look less
# so, but what would look good?).