From 7066338948a17bf7e538887fc0398a28eab5d15b Mon Sep 17 00:00:00 2001
From: Mickael Remond <mremond@process-one.net>
Date: Wed, 23 Mar 2016 16:16:50 +0100
Subject: [PATCH] Enable Riak test suite on Travis-CI

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2a95d953..51fd036df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,21 +28,21 @@ install:
   - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev
 
 before_script:
+  # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328
+  - sudo sh -c 'ulimit -n 4096'
+  - sudo sh -c 'echo "ulimit -n 4096" > /etc/default/riak'
   - mkdir "$PWD/ebin"
   - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config
   - sudo mv advanced.config /etc/riak/advanced.config
-  # MR: Temporarily stopping Riak to disable tests as Riak is too unreliable on Travis-ci
-  #- sudo service riak restart
-  - sudo service riak stop
+  - sudo service riak restart
   - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';"
   - mysql -u root -e "CREATE DATABASE ejabberd_test;"
   - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';"
   - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';"
   - psql -U postgres -c "CREATE DATABASE ejabberd_test;"
   - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;"
-  # MR: Temporarily stopping Riak to disable tests as Riak is too unreliable on Travis-ci
-  #- sudo /usr/sbin/riak-admin wait-for-service riak_kv 'riak@127.0.0.1'
-  #- sudo /usr/sbin/riak-admin test
+  - sudo /usr/sbin/riak-admin wait-for-service riak_kv 'riak@127.0.0.1'
+  - sudo /usr/sbin/riak-admin test
   # - tail -n 100000 /etc/riak/*
 
 script: