diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2014-07-09 22:59:45 +0400 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2014-07-10 13:55:38 +0400 |
| commit | 54cfd5091f9f8fc85a09a7376eb6f31223642a54 (patch) | |
| tree | 2aee10d04a1a22c97fc3c71b0ccb92a28e973ad0 /test | |
| parent | 2fe8e0dea5bb2aea7c728c44d3ab9d19fcb5e332 (diff) | |
Check Riak connection before running the corresponding suite
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index 522d99e63..f732d881a 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -69,9 +69,14 @@ init_per_group(ldap, Config) -> init_per_group(extauth, Config) -> set_opt(server, ?EXTAUTH_VHOST, Config); init_per_group(riak, Config) -> - mod_muc:shutdown_rooms(?RIAK_VHOST), - NewConfig = set_opt(server, ?RIAK_VHOST, Config), - clear_riak_tables(NewConfig); + case ejabberd_riak:is_connected() of + true -> + 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) -> Pid = start_event_relay(), set_opt(event_relay, Pid, Config). |