1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

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.
This commit is contained in:
yuuji.yaginuma 2017-11-13 18:06:34 +09:00
parent 1ecdd7e8a7
commit 8e964556e7
3 changed files with 5 additions and 9 deletions

View file

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

View file

@ -3,7 +3,7 @@
module ResqueJobsManager module ResqueJobsManager
def setup def setup
ActiveJob::Base.queue_adapter = :resque 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 Resque.logger = Rails.logger
unless can_run? 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" puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n"

View file

@ -5,14 +5,6 @@ require "sidekiq/api"
require "sidekiq/testing" require "sidekiq/testing"
Sidekiq::Testing.disable! 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 module SidekiqJobsManager
def setup def setup
ActiveJob::Base.queue_adapter = :sidekiq ActiveJob::Base.queue_adapter = :sidekiq