mirror of https://github.com/rails/rails
Make sidekiq and resque integration tests work in CI
Since8f2490b
, 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 Because8f2490b
removed password from `redis-server`. So must also remove passwords from these tests.
This commit is contained in:
parent
1ecdd7e8a7
commit
8e964556e7
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue