diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-11-13 18:04:37 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-11-13 21:02:33 +0900 |
| commit | 1ecdd7e8a7f671825f36217f4d96a90defc7ba88 (patch) | |
| tree | ffed36edf328864484198a799056dc215fd079d9 | |
| parent | 8f2490b57f488ed60fc6e0a201ccd5e66811ab51 (diff) | |
| download | rails-1ecdd7e8a7f671825f36217f4d96a90defc7ba88.tar.gz rails-1ecdd7e8a7f671825f36217f4d96a90defc7ba88.tar.bz2 rails-1ecdd7e8a7f671825f36217f4d96a90defc7ba88.zip | |
Return a non zero code when can not connect to redis in CI
| -rw-r--r-- | activejob/test/support/integration/adapters/resque.rb | 3 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb index 7d5174b957..cc33878cb9 100644 --- a/activejob/test/support/integration/adapters/resque.rb +++ b/activejob/test/support/integration/adapters/resque.rb @@ -7,7 +7,8 @@ module ResqueJobsManager 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..a92e9c4ffe 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -18,7 +18,8 @@ module SidekiqJobsManager 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 |