aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ejabberd_SUITE.erl2
-rw-r--r--test/ejabberd_SUITE_data/ejabberd.yml3
2 files changed, 5 insertions, 0 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index f17bfeb4c..b239ddf0b 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -293,6 +293,8 @@ db_tests(_) ->
test_unregister]},
{test_muc_register, [sequence],
[muc_register_master, muc_register_slave]},
+ {test_mix, [parallel],
+ [mix_master, mix_slave]},
{test_roster_subscribe, [parallel],
[roster_subscribe_master,
roster_subscribe_slave]},
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 96453f77b..923d69024 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -35,6 +35,7 @@ host_config:
- "flat"
- "hometree"
- "pep"
+ mod_mix: []
mod_roster:
versioning: true
store_current_id: true
@@ -88,6 +89,7 @@ Welcome to this XMPP server."
- "flat"
- "hometree"
- "pep"
+ mod_mix: []
mod_roster:
versioning: true
store_current_id: true
@@ -147,6 +149,7 @@ Welcome to this XMPP server."
- "flat"
- "hometree"
- "pep"
+ mod_mix: []
mod_roster:
versioning: true
store_current_id: true