diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-11-13 18:06:34 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-11-13 21:02:40 +0900 |
| commit | 8e964556e74925b48e9eb040403a9ebacff1406b (patch) | |
| tree | 2051140704c9ddde408f6fae3184abee3d1312f7 | |
| parent | 1ecdd7e8a7f671825f36217f4d96a90defc7ba88 (diff) | |
| download | rails-8e964556e74925b48e9eb040403a9ebacff1406b.tar.gz rails-8e964556e74925b48e9eb040403a9ebacff1406b.tar.bz2 rails-8e964556e74925b48e9eb040403a9ebacff1406b.zip | |
Make sidekiq and resque integration tests work in CI
Since 8f2490b, the integration test of sidekiq and resque is not working
in CI.
https://travis-ci.org/rails/rails/jobs/301276197#L2055
https://travis-ci.org/rails/rails/jobs/301276197#L2061
Because 8f2490b removed password from `redis-server`.
So must also remove passwords from these tests.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/resque.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f56bffdaab..40af3dd044 100644 --- a/.travis.yml +++ b/.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: diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb index cc33878cb9..2ed8302277 100644 --- a/activejob/test/support/integration/adapters/resque.rb +++ b/activejob/test/support/integration/adapters/resque.rb @@ -3,7 +3,7 @@ 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" diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index a92e9c4ffe..4b01a81ec5 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -5,14 +5,6 @@ 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 |