Merge pull request #202 from Shopify/rwstauner/redis-port

Enable running the ruby tests with alternate redis host/port

Author: rwstauner

ruby/dev.yml

@@ -8,4 +8,4 @@ up:
 - isogun
 
 commands:
-  test: REDIS_HOST=ci-queue.railgun bundle exec rake test
+  test: REDIS_URL=${REDIS_URL:-redis://ci-queue.railgun/0} bundle exec rake test

ruby/test/ci/queue/redis/test_time_record_test.rb

@@ -3,7 +3,7 @@
 
 class CI::Queue::Redis::TestTimeRecordTest < Minitest::Test
   def setup
-    redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+    redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
     redis = Redis.new(url: redis_url)
     redis.flushdb
 

ruby/test/ci/queue/redis_supervisor_test.rb

@@ -5,7 +5,7 @@ class CI::Queue::Redis::SupervisorTest < Minitest::Test
   include QueueHelper
 
   def setup
-    @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+    @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
     @redis = ::Redis.new(url: @redis_url)
     @redis.flushdb
     @supervisor = supervisor

ruby/test/ci/queue/redis_test.rb

@@ -5,7 +5,7 @@ class CI::Queue::RedisTest < Minitest::Test
   include SharedQueueAssertions
 
   def setup
-    @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+    @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
     @redis = ::Redis.new(url: @redis_url)
     @redis.flushdb
     super

ruby/test/integration/grind_redis_test.rb

@@ -6,7 +6,7 @@ class GrindRedisTest < Minitest::Test
     include OutputTestHelpers
 
     def setup
-      @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+      @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
       @redis = Redis.new(url: @redis_url)
       @redis.flushdb
       @exe = File.expand_path('../../../exe/minitest-queue', __FILE__)

ruby/test/integration/minitest_redis_test.rb

@@ -16,7 +16,7 @@ def setup
       @order_path = File.expand_path('../../fixtures/log/test_order.log', __FILE__)
       File.delete(@order_path) if File.exist?(@order_path)
 
-      @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+      @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
       @redis = Redis.new(url: @redis_url)
       @redis.flushdb
       @exe = File.expand_path('../../../exe/minitest-queue', __FILE__)

ruby/test/integration/rspec_redis_test.rb

@@ -6,7 +6,7 @@ class RSpecRedisTest < Minitest::Test
     include OutputTestHelpers
 
     def setup
-      @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+      @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
       @redis = Redis.new(url: @redis_url)
       @redis.flushdb
       @exe = File.expand_path('../../../exe/rspec-queue', __FILE__)

ruby/test/minitest/queue/build_status_recorder_test.rb

@@ -6,7 +6,7 @@ class BuildStatusRecorderTest < Minitest::Test
     include ReporterTestHelper
 
     def setup
-      @redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+      @redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
       @redis = ::Redis.new(url: @redis_url)
       @redis.flushdb
       @queue = worker(1)

ruby/test/minitest/queue/test_time_recorder_test.rb

@@ -4,7 +4,7 @@
 module Minitest::Queue
   class TestTimeRecorderTest < Minitest::Test
     def setup
-      redis_url = "redis://#{ENV.fetch('REDIS_HOST', 'localhost')}/7"
+      redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/0')
       redis = Redis.new(url: redis_url)
       redis.flushdb