Keep previous module options for some tests

esl · Nov 15, 2021 · 44ef957 · 44ef957
1 parent 30761a4
commit 44ef957
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl
@@ -524,30 +524,12 @@ impl_specific() ->
 suite() ->
     require_rpc_nodes([mim]) ++ escalus:suite().
 
-required_modules(global) ->
-    Backend = muc_helper:muc_backend(),
-    MucHostPattern = ct:get_config({hosts, mim, muc_service_pattern}),
-    [{mod_muc, [{host, subhost_pattern(MucHostPattern)},
-                           {backend, Backend},
-                           {hibernate_timeout, 2000},
-                           {hibernated_room_check_interval, 1000},
-                           {hibernated_room_timeout, 2000},
-                           {access, muc},
-                           {access_create, muc_create}]},
-     {mod_mam_muc, []},
-     {mod_muc_log, [{outdir, "/tmp/muclogs"},
-                           {access_log, muc}]}
-    ];
 required_modules(muc_light_stored_in_pm_if_allowed_to) ->
     [{mod_mam, [{archive_groupchats, true}]}];
 required_modules(muc_light_chat_markers_are_archived_if_enabled) ->
-    [{mod_mam_muc, [{host, {prefix,<<"muclight.">>}}, 
-                    {archive_groupchats,false}, 
-                    {archive_chat_markers, true}]}];
+    [{mod_mam_muc, [{archive_chat_markers, true}]}];
 required_modules(muc_light_chat_markers_are_not_archived_if_disabled) ->
-    [{mod_mam_muc, [{host, {prefix,<<"muclight.">>}}, 
-                    {archive_groupchats,false}, 
-                    {archive_chat_markers, false}]}];
+    [{mod_mam_muc, [{archive_chat_markers, false}]}];
 required_modules(muc_no_elements) ->
     [{mod_mam_muc, [no_stanzaid_element]}];
 required_modules(muc_only_stanzaid) ->
@@ -565,8 +547,6 @@ required_modules(_) ->
 
 init_per_suite(Config) ->
     muc_helper:load_muc(),
-    %Config1 = dynamic_modules:save_modules(host_type(), Config),
-    %dynamic_modules:ensure_modules(host_type(), required_modules(global)),
     Config2 = [{escalus_user_db, {module, escalus_ejabberd}} | escalus:init_per_suite(Config)],
     Config3 = delete_users(Config2),
     increase_limits(Config3).
@@ -1062,10 +1042,12 @@ init_per_testcase(C = muc_light_stored_in_pm_if_allowed_to, Config) ->
     clean_archives(Config),
     escalus:init_per_testcase(C, Config);
 init_per_testcase(C = muc_light_chat_markers_are_archived_if_enabled, Config) ->
-    dynamic_modules:ensure_modules(host_type(), required_modules(C)),
+    Opts = dynamic_modules:get_saved_config(host_type(), mod_mam_muc, Config),
+    dynamic_modules:ensure_modules(host_type(), [{mod_mam_muc, [{archive_chat_markers, true} | Opts]}]),
     escalus:init_per_testcase(C, Config);
 init_per_testcase(C = muc_light_chat_markers_are_not_archived_if_disabled, Config) ->
-    dynamic_modules:ensure_modules(host_type(), required_modules(C)),
+    Opts = dynamic_modules:get_saved_config(host_type(), mod_mam_muc, Config),
+    dynamic_modules:ensure_modules(host_type(), [{mod_mam_muc, [{archive_chat_markers, false} | Opts]}]),
     escalus:init_per_testcase(C, Config);
 init_per_testcase(C=archive_chat_markers, Config) ->
     Config1 = escalus_fresh:create_users(Config, [{alice, 1}, {bob, 1}]),