Ensure mod_presence is enabled by default for more host types

esl · Dec 28, 2022 · 09a4672 · 09a4672
1 parent 26f10e9
commit 09a4672
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/big_tests/default.spec b/big_tests/default.spec
@@ -110,11 +110,9 @@
 {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}.
+{suites, "tests", dynamic_domains_SUITE}.
 {suites, "tests", local_iq_SUITE}.
 % {suites, "tests", tcp_listener_SUITE}.
 

diff --git a/big_tests/dynamic_domains.spec b/big_tests/dynamic_domains.spec
@@ -35,7 +35,7 @@
 
 {suites, "tests", domain_isolation_SUITE}.
 
-% {suites, "tests", dynamic_domains_SUITE}.
+{suites, "tests", dynamic_domains_SUITE}.
 
 {suites, "tests", extdisco_SUITE}.
 
@@ -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/mim_c2s_SUITE.erl b/big_tests/tests/mim_c2s_SUITE.erl
@@ -35,6 +35,7 @@ init_per_suite(Config) ->
                         {start_ready_clients, fun ?MODULE:escalus_start/2}],
     Config1 = save_c2s_listener(Config),
     Config2 = dynamic_modules:save_modules(HostType, Config1),
+    dynamic_modules:ensure_stopped(HostType, [mod_presence]),
     Config3 = escalus_users:update_userspec(Config2, alice, connection_steps, Steps),
     Config4 = escalus_users:update_userspec(Config3, bob, connection_steps, Steps),
     configure_c2s_listener(Config4, #{backwards_compatible_session => false, max_stanza_size => 1024}),

diff --git a/rel/mim1.vars-toml.config b/rel/mim1.vars-toml.config
@@ -40,7 +40,7 @@
 
 [[host_config]]
   host_type = \"dummy auth\"
-  modules = { }
+  [host_config.modules.mod_presence]
 
   [host_config.auth.dummy]
     base_time = 1

diff --git a/rel/mim2.vars-toml.config b/rel/mim2.vars-toml.config
@@ -53,8 +53,8 @@
 {host_config,
   "[[host_config]]
   host_type = \"dummy auth\"
-  modules = { }
-  auth.dummy = { }"}.
+  [host_config.modules.mod_presence]
+  [host_config.auth.dummy]"}.
 
 %% Include common vars shared by all profiles
 "./vars-toml.config".