Enable blocked service_domain_db test

esl · Dec 28, 2022 · c8699e6 · c8699e6
1 parent 99b5137
commit c8699e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/big_tests/default.spec b/big_tests/default.spec
@@ -110,8 +110,6 @@
 {suites, "tests", websockets_SUITE}.
 {suites, "tests", xep_0352_csi_SUITE}.
 {suites, "tests", service_domain_db_SUITE}.
-{skip_cases, "tests", service_domain_db_SUITE,
- [rest_delete_domain_cleans_data_from_mam], "this test tries to use presences"}.
 {suites, "tests", domain_isolation_SUITE}.
 {suites, "tests", domain_removal_SUITE}.
 % {suites, "tests", dynamic_domains_SUITE}.

diff --git a/big_tests/dynamic_domains.spec b/big_tests/dynamic_domains.spec
@@ -140,8 +140,6 @@
 % {suites, "tests", sasl_external_SUITE}.
 
 {suites, "tests", service_domain_db_SUITE}.
-{skip_cases, "tests", service_domain_db_SUITE,
- [rest_delete_domain_cleans_data_from_mam], "this test tries to use presences"}.
 
 {suites, "tests", service_mongoose_system_metrics_SUITE}.
 {skip_cases, "tests", service_mongoose_system_metrics_SUITE,

diff --git a/big_tests/tests/service_domain_db_SUITE.erl b/big_tests/tests/service_domain_db_SUITE.erl
@@ -174,17 +174,18 @@ rest_cases() ->
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
     Config0 = dynamic_services:save_services(all_nodes(), Config),
-    Config1 = dynamic_modules:save_modules(dummy_auth_host_type(), Config0),
+    Config1 = dynamic_modules:save_modules(mim(), dummy_auth_host_type(), Config0),
+    Config2 = dynamic_modules:save_modules(mim2(), dummy_auth_host_type(), Config1),
     ensure_nodes_know_each_other(),
     service_disabled(mim()),
     service_disabled(mim2()),
     service_disabled(mim3()),
     prepare_test_queries(mim()),
     prepare_test_queries(mim2()),
     erase_database(mim()),
-    Config2 = ejabberd_node_utils:init(mim(), Config1),
+    Config3 = ejabberd_node_utils:init(mim(), Config2),
     mongoose_helper:inject_module(?MODULE),
-    escalus:init_per_suite([{service_setup, per_testcase} | Config2]).
+    escalus:init_per_suite([{service_setup, per_testcase} | Config3]).
 
 end_per_suite(Config) ->
     [restart_domain_core(Node) || Node <- all_nodes()],
@@ -266,8 +267,9 @@ end_per_testcase(TestcaseName, Config) ->
 init_per_testcase2(TestcaseName, Config)
     when TestcaseName =:= rest_delete_domain_cleans_data_from_mam ->
     HostType = dummy_auth_host_type(),
-    Mods = [{mod_mam, mam_helper:config_opts(#{pm => #{}})}],
-    dynamic_modules:ensure_modules(HostType, Mods),
+    Mods = [{mod_presence, #{}}, {mod_mam, mam_helper:config_opts(#{pm => #{}})}],
+    dynamic_modules:ensure_modules(mim(), HostType, Mods),
+    dynamic_modules:ensure_modules(mim2(), HostType, [{mod_presence, #{}}]),
     escalus:init_per_testcase(TestcaseName, Config);
 init_per_testcase2(_, Config) ->
     Config.