Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix single Redis connection being used across all threads (#18135)

Browse source 
* Fix single Redis connection being used across all Sidekiq threads

* Fix tests
This commit is contained in:
Eugen Rochko 2022-04-28 17:47:34 +02:00 • committed by GitHub
parent 9bf04db23a
commit 3917353645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 243 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/rails_helper.rb
View file

@ -13,7 +13,6 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
ActiveRecord::Migration.maintain_test_schema!
WebMock.disable_net_connect!(allow: Chewy.settings[:host])
Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
Sidekiq::Testing.inline!
Sidekiq.logger = nil
@ -44,6 +43,7 @@ RSpec.configure do |config|
config.include Devise::Test::ControllerHelpers, type: :view
config.include Paperclip::Shoulda::Matchers
config.include ActiveSupport::Testing::TimeHelpers
config.include Redisable
config.before :each, type: :feature do
https = ENV['LOCAL_HTTPS'] == 'true'
@ -60,7 +60,7 @@ RSpec.configure do |config|
config.after :each do
Rails.cache.clear
Redis.current.del(Redis.current.keys)
redis.del(redis.keys)
end
end