Check Riak connection before running the corresponding suite

diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 522d99e63672f861baf4df97aa52f892862c8665..f732d881a6b6b24ee15f4bc6aed1b374c2033ab4 100644 (file)
--- 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).