|
34 | 34 |
|
35 | 35 | -include_lib("common_test/include/ct.hrl").
|
36 | 36 | -include_lib("amqp_client/include/amqp_client.hrl").
|
| 37 | +-include_lib("eunit/include/eunit.hrl"). |
37 | 38 |
|
38 | 39 | -compile(export_all).
|
39 | 40 |
|
@@ -251,21 +252,20 @@ declare(Config, QueueName, Durable, AutoDelete, Args, Owner) ->
|
251 | 252 | verify_min_master(Config, Q) ->
|
252 | 253 | Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
|
253 | 254 | MinMaster = min_master_node(Config),
|
254 |
| - ct:pal("Expecting min master ~p~n", [MinMaster]), |
255 |
| - {ok, MinMaster} = rpc:call(Node, rabbit_queue_master_location_misc, |
256 |
| - lookup_master, [Q, ?DEFAULT_VHOST_PATH]). |
| 255 | + ?assertEqual({ok, MinMaster}, rpc:call(Node, rabbit_queue_master_location_misc, |
| 256 | + lookup_master, [Q, ?DEFAULT_VHOST_PATH])). |
257 | 257 |
|
258 | 258 | verify_random(Config, Q) ->
|
259 | 259 | [Node | _] = Nodes = rabbit_ct_broker_helpers:get_node_configs(Config,
|
260 | 260 | nodename),
|
261 | 261 | {ok, Master} = rpc:call(Node, rabbit_queue_master_location_misc,
|
262 | 262 | lookup_master, [Q, ?DEFAULT_VHOST_PATH]),
|
263 |
| - true = lists:member(Master, Nodes). |
| 263 | + ?assert(lists:member(Master, Nodes)). |
264 | 264 |
|
265 | 265 | verify_client_local(Config, Q) ->
|
266 | 266 | Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
|
267 |
| - {ok, Node} = rpc:call(Node, rabbit_queue_master_location_misc, |
268 |
| - lookup_master, [Q, ?DEFAULT_VHOST_PATH]). |
| 267 | + ?assertEqual({ok, Node}, rpc:call(Node, rabbit_queue_master_location_misc, |
| 268 | + lookup_master, [Q, ?DEFAULT_VHOST_PATH])). |
269 | 269 |
|
270 | 270 | set_location_policy(Config, Name, Strategy) ->
|
271 | 271 | ok = rabbit_ct_broker_helpers:set_policy(Config, 0,
|
|
0 commit comments