Merge pull request #3278 from esl/dynamic-domains-login-tests

Enable login_SUITE for dynamic domains
esl · Sep 17, 2021 · 498a4b1 · 498a4b1
2 parents 9e53098 + 641fab5
commit 498a4b1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/big_tests/dynamic_domains.config b/big_tests/dynamic_domains.config
@@ -146,7 +146,21 @@
         {username, <<"john">>},
         {server, <<"domain.example.com">>},
         {host, <<"localhost">>},
-        {password, <<"cosontuma">>}]}
+        {password, <<"cosontuma">>}]},
+    {neustradamus, [
+        {username, <<"neustradamus">>},
+        {server, <<"domain.example.com">>},
+        {host, <<"localhost">>},
+        {password, <<"scramshaplus">>},
+        {starttls, required},
+        {tls_module, fast_tls}]},
+    {hacker, [
+        {username, <<"hacker">>},
+        {server, <<"domain.example.com">>},
+        {host, <<"localhost">>},
+        {password, <<"bringdowntheserver">>},
+        {compression, <<"zlib">>},
+        {port, 5223}]}
 ]}.
 
 {escalus_anon_users, [

diff --git a/big_tests/dynamic_domains.spec b/big_tests/dynamic_domains.spec
@@ -45,6 +45,8 @@
 
 {suites, "tests", last_SUITE}.
 
+{suites, "tests", login_SUITE}.
+
 {suites, "tests", mam_SUITE}.
 
 {suites, "tests", mam_send_message_SUITE}.

diff --git a/big_tests/tests/login_SUITE.erl b/big_tests/tests/login_SUITE.erl
@@ -50,14 +50,13 @@ all() ->
     ].
 
 groups() ->
-    G = [{login, [parallel], all_tests()},
-         {login_digest, [sequence], digest_tests()},
-         {login_scram, [parallel], scram_tests()},
-         {login_scram_store_plain, [parallel], scram_tests()},
-         {login_scram_tls, [parallel], scram_tests()},
-         {login_specific_scram, [sequence], configure_specific_scram_test()},
-         {messages, [sequence], [messages_story, message_zlib_limit]}],
-    ct_helper:repeat_all_until_all_ok(G).
+    [{login, [parallel], all_tests()},
+     {login_digest, [sequence], digest_tests()},
+     {login_scram, [parallel], scram_tests()},
+     {login_scram_store_plain, [parallel], scram_tests()},
+     {login_scram_tls, [parallel], scram_tests()},
+     {login_specific_scram, [sequence], configure_specific_scram_test()},
+     {messages, [sequence], [messages_story, message_zlib_limit]}].
 
 scram_tests() ->
     [log_one,

diff --git a/big_tests/tests/mongoose_helper.erl b/big_tests/tests/mongoose_helper.erl
@@ -447,8 +447,8 @@ wait_for_pid_to_die(Pid) ->
     end.
 
 supports_sasl_module(Module) ->
-    Host = ct:get_config({hosts, mim, domain}),
-    rpc(mim(), ejabberd_auth, supports_sasl_module, [Host, Module]).
+    HostType = domain_helper:host_type(),
+    rpc(mim(), ejabberd_auth, supports_sasl_module, [HostType, Module]).
 
 backup_auth_config(Config) ->
     HostType = domain_helper:host_type(),