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

Merge pull request #37101 from eugeneius/active_job_sidekiq_integration_tests

Browse source 
Fix Active Job Sidekiq integration tests
This commit is contained in:
Ryuta Kamizono 2019-09-02 07:01:44 +09:00 committed by GitHub
commit f5943abcd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Gemfile.lock
View file

@ -389,7 +389,7 @@ GEM
ffi (~> 1.0) ffi (~> 1.0)
rdoc (6.0.4) rdoc (6.0.4)
redcarpet (3.2.3) redcarpet (3.2.3)
redis (4.1.1) redis (4.1.2)
redis-namespace (1.6.0) redis-namespace (1.6.0)
redis (>= 3.0.4) redis (>= 3.0.4)
regexp_parser (1.6.0) regexp_parser (1.6.0)
@ -448,10 +448,11 @@ GEM
sequel (5.14.0) sequel (5.14.0)
serverengine (2.0.7) serverengine (2.0.7)
sigdump (~> 0.2.2) sigdump (~> 0.2.2)
sidekiq (5.2.3) sidekiq (6.0.0)
connection_pool (~> 2.2, >= 2.2.2) connection_pool (>= 2.2.2)
rack-protection (>= 1.5.0) rack (>= 2.0.0)
redis (>= 3.3.5, < 5) rack-protection (>= 2.0.0)
redis (>= 4.1.0)
sigdump (0.2.4) sigdump (0.2.4)
signet (0.11.0) signet (0.11.0)
addressable (~> 2.3) addressable (~> 2.3)

2
activejob/test/support/integration/adapters/sidekiq.rb
View file

@ -36,7 +36,7 @@ module SidekiqJobsManager
$stderr.sync = true $stderr.sync = true
logfile = Rails.root.join("log/sidekiq.log").to_s logfile = Rails.root.join("log/sidekiq.log").to_s
Sidekiq::Logging.initialize_logger(logfile) Sidekiq.logger = Sidekiq::Logger.new(logfile)
self_read, self_write = IO.pipe self_read, self_write = IO.pipe
trap "TERM" do trap "TERM" do