From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 9 Jul 2014 18:59:45 +0000 (+0400)
Subject: Check Riak connection before running the corresponding suite
X-Git-Tag: 14.07~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54cfd5091f9f8fc85a09a7376eb6f31223642a54;p=ejabberd

Check Riak connection before running the corresponding suite
---

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).