diff options
| author | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-05-27 15:07:19 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-05-27 16:47:21 +0100 |
| commit | c00bd9f513a97538f428637843db68848bdef063 (patch) | |
| tree | 0485a7edb2c17a9df2680a9b6188fd0bd0b294ec /test | |
| parent | a36787f6c68db4674bc7651547ab8c18b40cc5a9 (diff) | |
| download | rabbitmq-server-git-c00bd9f513a97538f428637843db68848bdef063.tar.gz | |
Check return value of clear_policy in the test instead of auxiliary function
Diffstat (limited to 'test')
| -rw-r--r-- | test/dynamic_ha_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl index 8abfa68626..c54e4c2994 100644 --- a/test/dynamic_ha_SUITE.erl +++ b/test/dynamic_ha_SUITE.erl @@ -139,7 +139,7 @@ change_policy(Config) -> assert_slaves(A, ?QNAME, {A, [C]}, [{A, [B, C]}]), %% Clear the policy, and we go back to non-mirrored - rabbit_ct_broker_helpers:clear_policy(Config, A, ?POLICY), + ok = rabbit_ct_broker_helpers:clear_policy(Config, A, ?POLICY), assert_slaves(A, ?QNAME, {A, ''}), %% Test switching "away" from an unmirrored node @@ -208,7 +208,7 @@ rapid_loop(Config, Node, MRef) -> after 0 -> rabbit_ct_broker_helpers:set_ha_policy(Config, Node, ?POLICY, <<"all">>), - rabbit_ct_broker_helpers:clear_policy(Config, Node, ?POLICY), + ok = rabbit_ct_broker_helpers:clear_policy(Config, Node, ?POLICY), rapid_loop(Config, Node, MRef) end. @@ -374,7 +374,7 @@ prop_random_policy(Config) -> Result = verify_policy(Last, FinalInfo), %% Cleanup amqp_channel:call(Ch, #'queue.delete'{queue = ?QNAME}), - (catch rabbit_ct_broker_helpers:clear_policy(Config, NodeA, ?POLICY)), + _ = rabbit_ct_broker_helpers:clear_policy(Config, NodeA, ?POLICY), Result end). @@ -422,7 +422,7 @@ verify_policy({nodes, Nodes}, Info) -> %% Policies apply_policy(Config, N, undefined) -> - (catch rabbit_ct_broker_helpers:clear_policy(Config, N, ?POLICY)); + _ = rabbit_ct_broker_helpers:clear_policy(Config, N, ?POLICY); apply_policy(Config, N, all) -> rabbit_ct_broker_helpers:set_ha_policy( Config, N, ?POLICY, <<"all">>, |