25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00

Check Riak connection before running the corresponding suite

This commit is contained in:
Evgeniy Khramtsov 2014-07-09 22:59:45 +04:00
parent 2fe8e0dea5
commit 54cfd5091f

View File

@ -69,9 +69,14 @@ init_per_group(ldap, Config) ->
init_per_group(extauth, Config) -> init_per_group(extauth, Config) ->
set_opt(server, ?EXTAUTH_VHOST, Config); set_opt(server, ?EXTAUTH_VHOST, Config);
init_per_group(riak, Config) -> init_per_group(riak, Config) ->
mod_muc:shutdown_rooms(?RIAK_VHOST), case ejabberd_riak:is_connected() of
NewConfig = set_opt(server, ?RIAK_VHOST, Config), true ->
clear_riak_tables(NewConfig); mod_muc:shutdown_rooms(?RIAK_VHOST),
NewConfig = set_opt(server, ?RIAK_VHOST, Config),
clear_riak_tables(NewConfig);
Err ->
{skip, {riak_not_available, Err}}
end;
init_per_group(_GroupName, Config) -> init_per_group(_GroupName, Config) ->
Pid = start_event_relay(), Pid = start_event_relay(),
set_opt(event_relay, Pid, Config). set_opt(event_relay, Pid, Config).