Merge pull request #4505 from esl/non-parallel-fast-auth-tests-for-mssql

Port solution to run tests sequentially for mssql from the listeners branch

Author: chrzaszcz

big_tests/tests/ct_helper.erl

@@ -6,7 +6,8 @@
          repeat_all_until_any_fail/2,
          groups_to_all/1,
          get_preset_var/3,
-         get_internal_database/0]).
+         get_internal_database/0,
+         add_params_to_list/3]).
 
 -type group_name() :: atom().
 
@@ -131,3 +132,16 @@ get_internal_database() ->
         {ok, _} -> cets;
         {error, not_found} -> mnesia
     end.
+
+add_params_to_list(Groups, [], _IgnoreNames) ->
+    Groups;
+add_params_to_list(Groups, NewParams, IgnoreNames) ->
+    [add_params(Group, NewParams, IgnoreNames) || Group <- Groups].
+
+add_params({Name, Params, Tests} = Group, NewParams, IgnoreNames) ->
+    case lists:member(Name, IgnoreNames) of
+        true ->
+            Group;
+        false ->
+            {Name, NewParams ++ Params, Tests}
+    end.

big_tests/tests/fast_auth_token_SUITE.erl

@@ -21,7 +21,8 @@ all() ->
     [{group, Group} || {Group, _, _} <- groups()].
 
 groups() ->
-    [{Group, [parallel], tests()} || {Group, _Mech} <- mechanisms()].
+    Parallel = distributed_helper:maybe_parallel_group(),
+    [{Group, Parallel, tests()} || {Group, _Mech} <- mechanisms()].
 
 tests() ->
    [server_advertises_support_for_fast,

big_tests/tests/inbox_helper.erl

@@ -144,26 +144,11 @@ skip_or_run_inbox_tests(TestCases) ->
     end.
 
 maybe_run_in_parallel(Gs) ->
-    %% These could be parallel but it seems like mssql CI can't handle the load
-    case distributed_helper:rpc(
-           distributed_helper:mim(), mongoose_rdbms, db_engine, [domain_helper:host_type()]) of
-        odbc -> Gs;
-        _ -> insert_parallels(Gs)
-    end.
+    NewParams = distributed_helper:maybe_parallel_group(),
+    ct_helper:add_params_to_list(Gs, NewParams, non_parallel_groups()).
 
-insert_parallels(Gs) ->
-    Fun = fun({muclight_config, Conf, Tests}) ->
-                  {muclight_config, Conf, Tests};
-             ({bin, Conf, Tests}) ->
-                  {bin, Conf, Tests};
-             ({regular, Conf, Tests}) ->
-                  {regular, Conf, Tests};
-             ({async_pools, Conf, Tests}) ->
-                  {async_pools, Conf, Tests};
-             ({Group, Conf, Tests}) ->
-                  {Group, [parallel | Conf], Tests}
-          end,
-    lists:map(Fun, Gs).
+non_parallel_groups() ->
+    [muclight_config, bin, regular, async_pools].
 
 inbox_modules(Backend) ->
     [

big_tests/tests/service_domain_db_SUITE.erl

@@ -35,7 +35,7 @@ all() ->
     ].
 
 groups() ->
-    ParallelConfig = parallel_config(),
+    ParallelConfig = distributed_helper:maybe_parallel_group(),
     [
         {no_db, ParallelConfig, no_db_cases()},
         {db, [], [
@@ -62,14 +62,6 @@ groups() ->
         {rest_db_fails, [], rest_db_fails_cases()}
     ].
 
-parallel_config() ->
-    %% These could be parallel but it seems like mssql CI can't handle the load
-    case distributed_helper:rpc(
-           distributed_helper:mim(), mongoose_rdbms, db_engine, [domain_helper:host_type()]) of
-        odbc -> [];
-        _ -> [parallel]
-    end.
-
 no_db_cases() -> [
     api_lookup_works,
     api_lookup_not_found,

test/common/distributed_helper.erl

@@ -20,6 +20,18 @@ is_sm_distributed() ->
 is_sm_backend_distributed(ejabberd_sm_mnesia) -> true;
 is_sm_backend_distributed(Other) -> {false, Other}.
 
+db_engine() ->
+    rpc(mim(), mongoose_rdbms, db_engine, [domain_helper:host_type()]).
+
+%% To avoid DB timeouts, disables parallel execution for MSSQL
+maybe_parallel_group() ->
+    case catch db_engine() of
+        odbc ->
+            [];
+        _ ->
+            [parallel]
+    end.
+
 add_node_to_cluster(Config) ->
     Node2 = mim2(),
     add_node_to_cluster(Node2, Config).