aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2013-06-19 21:30:31 +1000
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2013-06-19 21:46:22 +1000
commit89c3cf3677e8b10dbf237e19b43e0fcabd6e72e0 (patch)
tree691108ad6361ad684a248fb40584f372c2086862 /test
parentAdd tests for modules using MySQL/PostgreSQL (diff)
Shutdown rooms before starting test cases
Diffstat (limited to 'test')
-rw-r--r--test/ejabberd_SUITE.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 05c7db275..f4e7d8d71 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -110,10 +110,12 @@ init_per_group(no_db, Config) ->
{atomic, ok} = ejabberd_auth:try_register(User, Server, Password),
Config;
init_per_group(mnesia, Config) ->
+ mod_muc:shutdown_rooms(?MNESIA_VHOST),
set_opt(server, ?MNESIA_VHOST, Config);
init_per_group(mysql, Config) ->
case catch ejabberd_odbc:sql_query(?MYSQL_VHOST, [<<"select 1;">>]) of
{selected, _, _} ->
+ mod_muc:shutdown_rooms(?MYSQL_VHOST),
create_sql_tables(mysql, ?config(base_dir, Config)),
set_opt(server, ?MYSQL_VHOST, Config);
Err ->
@@ -122,6 +124,7 @@ init_per_group(mysql, Config) ->
init_per_group(pgsql, Config) ->
case catch ejabberd_odbc:sql_query(?PGSQL_VHOST, [<<"select 1;">>]) of
{selected, _, _} ->
+ mod_muc:shutdown_rooms(?PGSQL_VHOST),
create_sql_tables(pgsql, ?config(base_dir, Config)),
set_opt(server, ?PGSQL_VHOST, Config);
Err ->