diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-13 21:48:30 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-13 21:48:30 +0900 |
commit | 705cf47033afabf4530a209f907ff4bf35acf2c2 (patch) | |
tree | a0f70a5804759571b57234018e98368bd9d1e3bc /activejob | |
parent | a968a7609db56f56298c462aa26809588f9375de (diff) | |
parent | 8e964556e74925b48e9eb040403a9ebacff1406b (diff) | |
download | rails-705cf47033afabf4530a209f907ff4bf35acf2c2.tar.gz rails-705cf47033afabf4530a209f907ff4bf35acf2c2.tar.bz2 rails-705cf47033afabf4530a209f907ff4bf35acf2c2.zip |
Merge pull request #31137 from y-yagi/make_sidekiq_and_resque_integration_tests_work_in_ci
Make sidekiq and resque integration tests work in ci
Diffstat (limited to 'activejob')
-rw-r--r-- | activejob/test/support/integration/adapters/resque.rb | 5 | ||||
-rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb index 7d5174b957..2ed8302277 100644 --- a/activejob/test/support/integration/adapters/resque.rb +++ b/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 diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index ceb7fb61f2..4b01a81ec5 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -5,20 +5,13 @@ require "sidekiq/api" 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 |