From c796e21d0f5a3e91930069124b56c12664a8b792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Wojtasik?= Date: Thu, 16 Sep 2021 17:15:44 +0200 Subject: [PATCH 1/4] Enable login_SUITE for dynamic_domains --- big_tests/dynamic_domains.config | 16 +++++++++++++++- big_tests/dynamic_domains.spec | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/big_tests/dynamic_domains.config b/big_tests/dynamic_domains.config index fa3bcd9739..7c8495024f 100644 --- 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 index af9827505b..6248de70af 100644 --- a/big_tests/dynamic_domains.spec +++ b/big_tests/dynamic_domains.spec @@ -39,6 +39,8 @@ {suites, "tests", last_SUITE}. +{suites, "tests", login_SUITE}. + {suites, "tests", mam_SUITE}. {suites, "tests", metrics_register_SUITE}. From 027752779d2539ac7d901817041b01afadfc89f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Wojtasik?= Date: Thu, 16 Sep 2021 17:17:34 +0200 Subject: [PATCH 2/4] Use host_type in mongoose_helper function --- big_tests/tests/mongoose_helper.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/big_tests/tests/mongoose_helper.erl b/big_tests/tests/mongoose_helper.erl index e8716ca760..8d95b527fa 100644 --- 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(), From a0a57e8166873ee8ea0c9a05c954aaa4525f6bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Wojtasik?= Date: Fri, 17 Sep 2021 09:25:54 +0200 Subject: [PATCH 3/4] Remove repeating tests when failed --- big_tests/tests/login_SUITE.erl | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/big_tests/tests/login_SUITE.erl b/big_tests/tests/login_SUITE.erl index b4df48e9a2..f7564bd709 100644 --- 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, From 641fab5ca6f52e318a88fde30bf33b823beb3d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Wojtasik?= Date: Fri, 17 Sep 2021 12:18:33 +0200 Subject: [PATCH 4/4] Fix indentation --- big_tests/dynamic_domains.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/big_tests/dynamic_domains.config b/big_tests/dynamic_domains.config index 7c8495024f..0577674f52 100644 --- a/big_tests/dynamic_domains.config +++ b/big_tests/dynamic_domains.config @@ -156,7 +156,7 @@ {tls_module, fast_tls}]}, {hacker, [ {username, <<"hacker">>}, - {server, <<"domain.example.com">>}, + {server, <<"domain.example.com">>}, {host, <<"localhost">>}, {password, <<"bringdowntheserver">>}, {compression, <<"zlib">>},