From f55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f Mon Sep 17 00:00:00 2001
From: Marc Ignacio <marcrendlignacio@gmail.com>
Date: Thu, 22 Jun 2017 09:10:08 +0800
Subject: Allows for other common redis options to be in cable.yml, by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Adds RedisAdapterTest::AlternateConfiguration to account
  for a relatively common alternative setup, as it’s used
  as the first example in the
  [Redis rubygem](https://github.com/redis/redis-rb#getting-started)

- Supplies original RedisAdapterTest with more complete
  redis:// url format by adding a ‘userinfo’ (blank user),
  so that it resembles the alternate configuration

- Supplies original EventedRedisAdapterTest with more complete
  redis:// url as well

- Adds before_script to start redis-server with password as a daemon
  and with explicit defaults copied from the default redis.conf
  (Instead of using Travis' default init/upstart scripts for `redis` service)
---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 847e11900a..91ac7e8e5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ cache:
 
 services:
   - memcached
-  - redis
 
 addons:
   postgresql: "9.4"
@@ -34,6 +33,7 @@ before_script:
   # Decodes to e.g. `export VARIABLE=VALUE`
   - $(base64 --decode <<< "ZXhwb3J0IFNBVUNFX0FDQ0VTU19LRVk9YTAzNTM0M2YtZTkyMi00MGIzLWFhM2MtMDZiM2VhNjM1YzQ4")
   - $(base64 --decode <<< "ZXhwb3J0IFNBVUNFX1VTRVJOQU1FPXJ1YnlvbnJhaWxz")
+  - redis-server --bind 127.0.0.1 --port 6379 --requirepass 'password' --daemonize yes
 
 script: 'ci/travis.rb'
 
@@ -65,25 +65,21 @@ matrix:
       env: "GEM=aj:integration"
       services:
         - memcached
-        - redis
         - rabbitmq
     - rvm: 2.3.4
       env: "GEM=aj:integration"
       services:
         - memcached
-        - redis
         - rabbitmq
     - rvm: 2.4.1
       env: "GEM=aj:integration"
       services:
         - memcached
-        - redis
         - rabbitmq
     - rvm: ruby-head
       env: "GEM=aj:integration"
       services:
         - memcached
-        - redis
         - rabbitmq
     - rvm: 2.3.4
       env:
-- 
cgit v1.2.3