Fix #1080 #1081
Fix #1080 #1081
Conversation
| @@ -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), | |||
There was a problem hiding this comment.
According to Elvis:
Line 50 is too long: distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), Config1),.
| 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)). |
There was a problem hiding this comment.
According to Elvis:
Line 51 is too long: escalus:delete_users(Config1, escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS))..
There was a problem hiding this comment.
Hi @kenstir
Thanks a lot for your contribution and for using MongooseIM. I really appreciate the smallest changes improving integration with other CI tools, or just making things easier.
I commented on things we may not want in main repo. Also, it would be perfect if you could fix the 2 Elvis's suggestions as well.
| @@ -49,13 +49,14 @@ otp_release: | |||
| - 18.3 | |||
| env: | |||
| - PRESET=internal_mnesia DB=mnesia REL_CONFIG=with-all | |||
| ken_disabled_upstream_env: | |||
There was a problem hiding this comment.
Re-enable all the disabled presets for mainstream repo. I understand in your setup you need only one preset. Here in the main repo we need to test all the configurations.
| - PRESET=mysql_redis DB=mysql REL_CONFIG="with-mysql with-redis" | ||
| - PRESET=odbc_pgsql_mnesia DB=pgsql REL_CONFIG=with-odbc | ||
| - PRESET=ldap_mnesia DB=mnesia REL_CONFIG=with-none | ||
| - PRESET=riak_mnesia DB=riak REL_CONFIG=with-riak | ||
| - PRESET=dialyzer_only | ||
|
|
||
| matrix: | ||
| ken_disabled_upstream_matrix: |
There was a problem hiding this comment.
The same thing as re ken_disabled_upstream_env
| @@ -0,0 +1,74 @@ | |||
| %% Spec examples: | |||
There was a problem hiding this comment.
We probably don't need jenkins.spec file in main repo.
| @@ -0,0 +1,165 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
Is there any way to merge this file with tools/travis-test.sh?
|
Hi Michal, Thanks for your helpful comments. I accidentally submitted this PR with all the changes in my repo, when what I really wanted was just the single commit fe4a97c fixing the issue. I am sorry for the trouble. What is better for you, a new PR or an update to this one? |
|
You can rebase and force push this one. |
kenstir
force-pushed
the
fix-test-cleanup-1080
branch
from
fe4a97c to
0bac895
Compare
| 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)). |
There was a problem hiding this comment.
According to Elvis:
Line 51 is too long: escalus:delete_users(Config1, escalus:get_users(?ONLY_GLOBAL_METRICS_GROUP_USERS))..
| @@ -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), | |||
There was a problem hiding this comment.
According to Elvis:
Line 50 is too long: distributed_helper:remove_node_from_cluster(ejabberd_node_utils:mim2(), Config1),.
|
Thanks a lot @kenstir! |
This PR addresses #1080
Proposed changes include: