diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-07-10 07:42:17 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-07-10 07:42:17 +0900 |
| commit | 46725b33a90ce4a69e88b5c734703f9d7f4cf669 (patch) | |
| tree | 9f804c7d2ea788a67b894e7cea1ccd4298af711f /activejob/test | |
| parent | 92be910f6a7d918a3d1c6fce6bd9caa565bf6ab5 (diff) | |
| download | rails-46725b33a90ce4a69e88b5c734703f9d7f4cf669.tar.gz rails-46725b33a90ce4a69e88b5c734703f9d7f4cf669.tar.bz2 rails-46725b33a90ce4a69e88b5c734703f9d7f4cf669.zip | |
Make sidekiq and resque integration tests work in CI
Since f55ecc6, the integration test of sidekiq and resque is not working
in CI.
https://travis-ci.org/rails/rails/jobs/251783876
Because f55ecc6 required a password to access redis.
Therefore, handling by passing passwords when connecting to redis.
Diffstat (limited to 'activejob/test')
| -rw-r--r-- | activejob/test/support/integration/adapters/resque.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb index ef2dd75687..5d142d324d 100644 --- a/activejob/test/support/integration/adapters/resque.rb +++ b/activejob/test/support/integration/adapters/resque.rb @@ -2,7 +2,7 @@ module ResqueJobsManager def setup ActiveJob::Base.queue_adapter = :resque - Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://127.0.0.1:6379/12", thread_safe: true) + Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://:password@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" diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index 8c90410e76..253cbd550b 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -4,6 +4,14 @@ 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 |