Removing deprecated test configs from tests #1088

ferigis · 2016-11-25T13:48:33Z

Removing deprecated test configs from tests

gadgetci · 2016-11-25T13:49:21Z

test/ejabberd_tests/tests/presence_SUITE.erl

@@ -611,15 +611,15 @@ remove_roster(Config, UserSpec) ->
    end.

 set_versioning(Versioning, VersionStore, Config) ->
-    Host = escalus_ct:get_config(ejabberd_domain),
+    Host = ct:get_config({hosts, mim, domain}),
    RosterVersioning = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, versioning, false]),


According to Elvis:

Line 615 is too long: RosterVersioning = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, versioning, false]),.

gadgetci · 2016-11-25T13:49:22Z

test/ejabberd_tests/tests/metrics_api_SUITE.erl

@@ -310,4 +311,3 @@ assert_counter_inc(_Name, Inc, Counter1, Counter2) when Counter1 + Inc =:= Count

 get_diffs(L1,L2) ->


According to Elvis:

Missing space right "," on line 312

gadgetci · 2016-11-25T13:49:23Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:23Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -212,7 +212,7 @@ request_search_fields(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 216

gadgetci · 2016-11-25T13:49:24Z

test/ejabberd_tests/tests/presence_SUITE.erl

@@ -611,15 +611,15 @@ remove_roster(Config, UserSpec) ->
    end.

 set_versioning(Versioning, VersionStore, Config) ->
-    Host = escalus_ct:get_config(ejabberd_domain),
+    Host = ct:get_config({hosts, mim, domain}),
    RosterVersioning = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, versioning, false]),
    RosterVersionOnDb = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, store_current_id, false]),


According to Elvis:

Line 616 is too long: RosterVersionOnDb = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, store_current_id, false]),.

gadgetci · 2016-11-25T13:49:25Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -500,7 +500,7 @@ search_in_service_discovery(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              ServJID = escalus_ct:get_config(ejabberd_domain),
+              ServJID = ct:get_config({hosts, mim, domain}),
              DirJID = <<"directory.",ServJID/binary>>,


According to Elvis:

Missing space right "," on line 504

gadgetci · 2016-11-25T13:49:26Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:26Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:27Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-25T13:49:28Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:29Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -143,7 +143,7 @@ user_doesnt_exist(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              BadJID = <<"nonexistent@",Domain/binary>>,


According to Elvis:

Missing space right "," on line 147

gadgetci · 2016-11-25T13:49:29Z

test/ejabberd_tests/tests/ejabberdctl_SUITE.erl

@@ -131,7 +131,9 @@ init_per_group(vcard, Config) ->
    end;

 init_per_group(roster_advanced, Config) ->
-    case escalus_ejabberd:rpc(gen_mod,get_module_opt,[ct:get_config(ejabberd_domain), mod_roster, backend, mnesia]) of
+    case escalus_ejabberd:rpc(gen_mod,get_module_opt,


According to Elvis:

Missing space right "," on line 134

gadgetci · 2016-11-25T13:49:30Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:31Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:32Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:32Z

test/ejabberd_tests/tests/ejabberdctl_SUITE.erl

@@ -122,7 +122,7 @@ end_per_suite(Config) ->

 init_per_group(vcard, Config) ->
    case escalus_ejabberd:rpc(gen_mod,get_module_opt,


According to Elvis:

Missing space right "," on line 124

gadgetci · 2016-11-25T13:49:33Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -250,7 +250,7 @@ search_some(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 254

gadgetci · 2016-11-25T13:49:34Z

test/ejabberd_tests/tests/presence_SUITE.erl

@@ -611,15 +611,15 @@ remove_roster(Config, UserSpec) ->
    end.

 set_versioning(Versioning, VersionStore, Config) ->
-    Host = escalus_ct:get_config(ejabberd_domain),
+    Host = ct:get_config({hosts, mim, domain}),
    RosterVersioning = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, versioning, false]),
    RosterVersionOnDb = escalus_ejabberd:rpc(gen_mod, get_module_opt, [Host, mod_roster, store_current_id, false]),
    escalus_ejabberd:rpc(gen_mod, set_module_opt, [Host, mod_roster, versioning, Versioning]),
    escalus_ejabberd:rpc(gen_mod, set_module_opt, [Host, mod_roster, store_current_id, VersionStore]),


According to Elvis:

Line 618 is too long: escalus_ejabberd:rpc(gen_mod, set_module_opt, [Host, mod_roster, store_current_id, VersionStore]),.

gadgetci · 2016-11-25T13:49:35Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:36Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -250,7 +250,7 @@ search_some(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,
              Fields = [{get_field_name(fn), get_FN(Config)}],
              timer:sleep(timer:seconds(1)), %% this is required by Riak 2.0 Search to be sure the vcard is indexed


According to Elvis:

Line 256 is too long: timer:sleep(timer:seconds(1)), %% this is required by Riak 2.0 Search to be sure the vcard is indexed.

gadgetci · 2016-11-25T13:49:36Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -419,7 +419,9 @@ search_result_item_tuples(Stanza) ->
    _ItemTups = item_tuples(ReportedFieldTups, XChildren).

 is_vcard_ldap()->
-    ldap==escalus_ejabberd:rpc(gen_mod,get_module_opt,[ct:get_config(ejabberd_domain), mod_vcard, backend, mnesia]).
+    ldap==escalus_ejabberd:rpc(gen_mod,get_module_opt,


According to Elvis:

Missing space right "," on line 422

gadgetci · 2016-11-25T13:49:37Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -462,7 +462,7 @@ search_open_limited(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Server = escalus_ct:get_config(ejabberd_domain),
+              Server = ct:get_config({hosts, mim, domain}),
              DirJID = <<"directory.",Server/binary>>,


According to Elvis:

Missing space right "," on line 466

gadgetci · 2016-11-25T13:49:38Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:39Z

test/ejabberd_tests/tests/shared_roster_SUITE.erl

@@ -154,7 +156,7 @@ stop_roster_module(_)->
    ok.

 get_auth_method() ->
-    XMPPDomain = ct:get_config(ejabberd_domain),
+    XMPPDomain = ct:get_config({hosts, mim, domain}),
    escalus_ejabberd:rpc(ejabberd_config, get_local_option,[{auth_method, XMPPDomain}]).


According to Elvis:

Missing space right "," on line 160

gadgetci · 2016-11-25T13:49:39Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-25T13:49:40Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-25T13:49:41Z

test/ejabberd_tests/tests/vcard_SUITE.erl

@@ -1085,5 +1085,3 @@ vcard_result_mapping(_) -> undefined.
 get_utf8_city() ->
    %% This is the UTF-8 of Москва
    <<208,156,208,190,209,129,208,186,208,178,208,176>>.


According to Elvis:

Missing space right "," on line 1087

gadgetci · 2016-11-29T10:59:55Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-29T10:59:56Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-29T13:56:09Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-29T13:56:10Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-30T12:24:52Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-30T12:24:53Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-30T15:40:37Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-30T15:40:39Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-30T17:05:19Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-30T17:05:20Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

gadgetci · 2016-11-30T18:41:03Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -269,7 +269,7 @@ search_wildcard(Config) ->
    escalus:story(
      Config, [{bob, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 273

gadgetci · 2016-11-30T18:41:04Z

test/ejabberd_tests/tests/vcard_simple_SUITE.erl

@@ -235,7 +235,7 @@ search_empty(Config) ->
    escalus:story(
      Config, [{alice, 1}],
      fun(Client) ->
-              Domain = escalus_config:get_ct(ejabberd_domain),
+              Domain = ct:get_config({hosts, mim, domain}),
              DirJID = <<"vjud.",Domain/binary>>,


According to Elvis:

Missing space right "," on line 239

michalwski · 2016-12-01T19:21:52Z

test/ejabberd_tests/test.config

-{ejabberd_reloaded_domain, <<"sogndal">>}.
-{ejabberd_metrics_rest_port, 5288}.
-{ejabberd2_metrics_rest_port, 5289}.
+%% the main XMPP domain served by the tested ejabberd/MongooseIM.


Let's remove the comment as it is no longer relevant

ferigis added the WIP 🚧 label Nov 25, 2016

gadgetci reviewed Nov 25, 2016

View reviewed changes

gadgetci reviewed Nov 29, 2016

View reviewed changes

gadgetci reviewed Nov 30, 2016

View reviewed changes

ferigis force-pushed the ferigis.remove_deprecated_tests_config branch from 2963afc to 77e0760 Compare December 1, 2016 13:17

removing ejabberd_domain from test.config

77e0760

ferigis removed the WIP 🚧 label Dec 1, 2016

michalwski reviewed Dec 1, 2016

View reviewed changes

Fixing PR comments

c5ff294

michalwski merged commit 4a768cd into master Dec 5, 2016

michalwski deleted the ferigis.remove_deprecated_tests_config branch December 5, 2016 07:20

		@@ -310,4 +311,3 @@ assert_counter_inc(_Name, Inc, Counter1, Counter2) when Counter1 + Inc =:= Count

		get_diffs(L1,L2) ->

		@@ -122,7 +122,7 @@ end_per_suite(Config) ->

		init_per_group(vcard, Config) ->
		case escalus_ejabberd:rpc(gen_mod,get_module_opt,

Removing deprecated test configs from tests #1088

Removing deprecated test configs from tests #1088

Conversation

ferigis commented Nov 25, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment