From 0bac895606345af05ddf23e48ff1048343cd9a85 Mon Sep 17 00:00:00 2001 From: Ken Cox Date: Fri, 18 Nov 2016 14:34:47 -0500 Subject: [PATCH 1/2] Fix for issue #1080 - metrics_api_SUITE:end_per_group failed for Reason: badarg --- test/ejabberd_tests/tests/metrics_helper.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ejabberd_tests/tests/metrics_helper.erl b/test/ejabberd_tests/tests/metrics_helper.erl index 9d08e5268ef..55daa07b865 100644 --- a/test/ejabberd_tests/tests/metrics_helper.erl +++ b/test/ejabberd_tests/tests/metrics_helper.erl @@ -47,8 +47,8 @@ finalise_by_all_metrics_are_global(Config, false) -> finalise_by_all_metrics_are_global(Config, true) -> Config1 = lists:keydelete(all_metrics_are_global, 1, Config), %% TODO: Refactor once escalus becomes compatible with multiple nodes RPC - Config2 = distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), Config1), - escalus:delete_users(Config2, escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS)). + distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), Config1), + escalus:delete_users(Config1, escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS)). all_metrics_are_global(Config) -> case lists:keyfind(all_metrics_are_global, 1, Config) of From 04861ea0f3f57580d0c724294f176d456ce7d01d Mon Sep 17 00:00:00 2001 From: Ken Cox Date: Thu, 8 Dec 2016 10:25:49 -0500 Subject: [PATCH 2/2] Fix elvis complaints re: line too long --- test/ejabberd_tests/tests/metrics_helper.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/ejabberd_tests/tests/metrics_helper.erl b/test/ejabberd_tests/tests/metrics_helper.erl index 55daa07b865..a1a50a45f03 100644 --- a/test/ejabberd_tests/tests/metrics_helper.erl +++ b/test/ejabberd_tests/tests/metrics_helper.erl @@ -47,8 +47,10 @@ finalise_by_all_metrics_are_global(Config, false) -> finalise_by_all_metrics_are_global(Config, true) -> Config1 = lists:keydelete(all_metrics_are_global, 1, Config), %% TODO: Refactor once escalus becomes compatible with multiple nodes RPC - distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), Config1), - escalus:delete_users(Config1, escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS)). + distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), + Config1), + escalus:delete_users(Config1, + escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS)). all_metrics_are_global(Config) -> case lists:keyfind(all_metrics_are_global, 1, Config) of