diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
commit | 0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (patch) | |
tree | 9ff7dd7b21a3f9642a8fbb45c922f71a433faf02 /spec/support/sidekiq.rb | |
parent | a048261403ea7e12992ccffe704f0779235712d7 (diff) | |
download | gitlab-ce-0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/sidekiq.rb')
-rw-r--r-- | spec/support/sidekiq.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb index 246efedc7e5..a6d6d5fc6e1 100644 --- a/spec/support/sidekiq.rb +++ b/spec/support/sidekiq.rb @@ -1,31 +1,5 @@ # frozen_string_literal: true -require 'sidekiq/testing' - -# If Sidekiq::Testing.inline! is used, SQL transactions done inside -# Sidekiq worker are included in the SQL query limit (in a real -# deployment sidekiq worker is executed separately). To avoid -# increasing SQL limit counter, the request is marked as whitelisted -# during Sidekiq block -class DisableQueryLimit - def call(worker_instance, msg, queue) - transaction = Gitlab::QueryLimiting::Transaction.current - - if !transaction.respond_to?(:whitelisted) || transaction.whitelisted - yield - else - transaction.whitelisted = true - yield - transaction.whitelisted = false - end - end -end - -Sidekiq::Testing.server_middleware do |chain| - chain.add Gitlab::SidekiqStatus::ServerMiddleware - chain.add DisableQueryLimit -end - RSpec.configure do |config| config.around(:each, :sidekiq) do |example| Sidekiq::Worker.clear_all |