Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable login_SUITE for dynamic domains #3278

Merged
merged 4 commits into from
Sep 17, 2021
Merged

Enable login_SUITE for dynamic domains #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c796e21
Enable login_SUITE for dynamic_domains
Premwoik Sep 16, 2021
0277527
Use host_type in mongoose_helper function
Premwoik Sep 16, 2021
a0a57e8
Remove repeating tests when failed
Premwoik Sep 17, 2021
641fab5
Fix indentation
Premwoik Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion big_tests/dynamic_domains.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand Down
2 changes: 2 additions & 0 deletions big_tests/dynamic_domains.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@

{suites, "tests", last_SUITE}.

{suites, "tests", login_SUITE}.

{suites, "tests", mam_SUITE}.

{suites, "tests", metrics_register_SUITE}.
Expand Down
15 changes: 7 additions & 8 deletions big_tests/tests/login_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions big_tests/tests/mongoose_helper.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down