Merge pull request #31137 from y-yagi/make_sidekiq_and_resque_integra…

…tion_tests_work_in_ci

Make sidekiq and resque integration tests work in ci

.travis.yml

@@ -73,21 +73,25 @@ matrix:
       env: "GEM=aj:integration"
       services:
         - memcached
+        - redis-server
         - rabbitmq
     - rvm: 2.3.5
       env: "GEM=aj:integration"
       services:
         - memcached
+        - redis-server
         - rabbitmq
     - rvm: 2.4.2
       env: "GEM=aj:integration"
       services:
         - memcached
+        - redis-server
         - rabbitmq
     - rvm: ruby-head
       env: "GEM=aj:integration"
       services:
         - memcached
+        - redis-server
         - rabbitmq
     - rvm: 2.3.5
       env:

activejob/test/support/integration/adapters/resque.rb

@@ -3,11 +3,12 @@
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
-    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.new(url: "redis://:password@127.0.0.1:6379/12", thread_safe: true)
+    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.new(url: "redis://127.0.0.1:6379/12", thread_safe: true)
     Resque.logger = Rails.logger
     unless can_run?
       puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n"
-      exit
+      status = ENV["CI"] ? false : true
+      exit status
     end
   end
 

activejob/test/support/integration/adapters/sidekiq.rb

@@ -5,20 +5,13 @@
 require "sidekiq/testing"
 Sidekiq::Testing.disable!
 
-Sidekiq.configure_server do |config|
-  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
-end
-
-Sidekiq.configure_client do |config|
-  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
-end
-
 module SidekiqJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sidekiq
     unless can_run?
       puts "Cannot run integration tests for sidekiq. To be able to run integration tests for sidekiq you need to install and start redis.\n"
-      exit
+      status = ENV["CI"] ? false : true
+      exit status
     end
   end