diff options
| author | Mickael Remond <mremond@process-one.net> | 2016-03-15 22:42:15 +0100 |
|---|---|---|
| committer | Mickael Remond <mremond@process-one.net> | 2016-03-15 22:42:15 +0100 |
| commit | 3c2cd91fb1386c094a4b0deb92bc28225d80454e (patch) | |
| tree | de5a4bc462c7e689474f54881c92e61ff3bb8db0 /test | |
| parent | Better error reporting when running Elixir test suite (diff) | |
| parent | Produce less verbose logs for tests on travis (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.yml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index f17bfeb4..b239ddf0 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 96453f77..923d6902 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 |