Add Riak backend to the testing suit

3 files changed, 98 insertions, 4 deletions

diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 52d3e695a..d145d5897 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -68,6 +68,8 @@ init_per_group(ldap, Config) ->
     set_opt(server, ?LDAP_VHOST, Config);
 init_per_group(extauth, Config) ->
     set_opt(server, ?EXTAUTH_VHOST, Config);
+init_per_group(riak, Config) ->
+    set_opt(server, ?RIAK_VHOST, Config);
 init_per_group(_GroupName, Config) ->
     Pid = start_event_relay(),
     set_opt(event_relay, Pid, Config).
@@ -84,6 +86,8 @@ end_per_group(ldap, _Config) ->
     ok;
 end_per_group(extauth, _Config) ->
     ok;
+end_per_group(riak, _Config) ->
+    ok;
 end_per_group(_GroupName, Config) ->
     stop_event_relay(Config),
     ok.
@@ -178,6 +182,54 @@ db_tests() ->
       [roster_remove_master,
        roster_remove_slave]}].
 
+db_tests(riak) ->
+    %% No support for mod_pubsub
+    [{single_user, [sequence],
+      [test_register,
+       auth_plain,
+       auth_md5,
+       presence_broadcast,
+       last,
+       roster_get,
+       private,
+       privacy,
+       blocking,
+       vcard,
+       muc_single,
+       test_unregister]},
+     {test_roster_subscribe, [parallel],
+      [roster_subscribe_master,
+       roster_subscribe_slave]},
+     {test_offline, [sequence],
+      [offline_master, offline_slave]},
+     {test_roster_remove, [parallel],
+      [roster_remove_master,
+       roster_remove_slave]}];
+db_tests(_) ->
+    [{single_user, [sequence],
+      [test_register,
+       auth_plain,
+       auth_md5,
+       presence_broadcast,
+       last,
+       roster_get,
+       roster_ver,
+       private,
+       privacy,
+       blocking,
+       vcard,
+       muc_single,
+       pubsub,
+       test_unregister]},
+     {test_roster_subscribe, [parallel],
+      [roster_subscribe_master,
+       roster_subscribe_slave]},
+     {test_offline, [sequence],
+      [offline_master, offline_slave]},
+     {test_roster_remove, [parallel],
+      [roster_remove_master,
+       roster_remove_slave]}].
+
 ldap_tests() ->
     [{ldap_tests, [sequence],
       [test_auth,
@@ -192,9 +244,10 @@ groups() ->
     [{ldap, [sequence], ldap_tests()},
      {extauth, [sequence], extauth_tests()},
      {no_db, [sequence], no_db_tests()},
-     {mnesia, [sequence], db_tests()},
-     {mysql, [sequence], db_tests()},
-     {pgsql, [sequence], db_tests()}].
+     {mnesia, [sequence], db_tests(mnesia)},
+     {mysql, [sequence], db_tests(mysql)},
+     {pgsql, [sequence], db_tests(pgsql)},
+     {riak, [sequence], db_tests(riak)}].
 
 all() ->
     [{group, ldap},
@@ -203,6 +256,7 @@ all() ->
      {group, mysql},
      {group, pgsql},
      {group, extauth},
+     {group, riak},
      stop_ejabberd].
 
 stop_ejabberd(Config) ->
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index fd80b199f..f0cad2023 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -151,6 +151,44 @@ Welcome to this XMPP server."
       mod_stats: []
       mod_time: []
       mod_version: []
+  "riak.localhost": 
+    auth_method: riak
+    modules: 
+      mod_announce: 
+        db_type: riak
+      mod_blocking: 
+        db_type: riak
+      mod_caps: 
+        db_type: riak
+      mod_last: 
+        db_type: riak
+      mod_muc: 
+        db_type: riak
+      mod_offline: 
+        db_type: riak
+      mod_privacy: 
+        db_type: riak
+      mod_private: 
+        db_type: riak
+      mod_roster: 
+        versioning: true
+        store_current_id: true
+        db_type: riak
+      mod_vcard: 
+        db_type: riak
+      mod_adhoc: []
+      mod_configure: []
+      mod_disco: []
+      mod_ping: []
+      mod_proxy65: []
+      mod_register: 
+        welcome_message: 
+          subject: "Welcome!"
+          body: "Hi.
+Welcome to this XMPP server."
+      mod_stats: []
+      mod_time: []
+      mod_version: []
   "localhost": 
     auth_method: internal
   "ldap.localhost": 
@@ -186,6 +224,7 @@ hosts:
   - "pgsql.localhost"
   - "extauth.localhost"
   - "ldap.localhost"
+  - "riak.localhost"
 access: 
   announce: 
     admin: allow
@@ -258,4 +297,4 @@ Welcome to this XMPP server."
 registration_timeout: infinity
 shaper: 
   fast: 50000
-  normal: 1000
\ No newline at end of file
+  normal: 1000
diff --git a/test/suite.hrl b/test/suite.hrl
index 2c3610268..ddd751e23 100644
--- a/test/suite.hrl
+++ b/test/suite.hrl
@@ -59,6 +59,7 @@
 -define(PGSQL_VHOST, <<"pgsql.localhost">>).
 -define(LDAP_VHOST, <<"ldap.localhost">>).
 -define(EXTAUTH_VHOST, <<"extauth.localhost">>).
+-define(RIAK_VHOST, <<"riak.localhost">>).
 
 insert(Val, N, Tuple) ->
     L = tuple_to_list(Tuple),