diff options
Diffstat (limited to 'spec/support/sidekiq_middleware.rb')
| -rw-r--r-- | spec/support/sidekiq_middleware.rb | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/spec/support/sidekiq_middleware.rb b/spec/support/sidekiq_middleware.rb index 62f81ef1669..cbd6163d46b 100644 --- a/spec/support/sidekiq_middleware.rb +++ b/spec/support/sidekiq_middleware.rb @@ -15,20 +15,14 @@ end # 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 +# deployment sidekiq worker is executed separately). To avoid increasing +# SQL limit counter, query limiting is disabled 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 + ::Gitlab::QueryLimiting.disable!('https://mock-issue') + yield + ensure + ::Gitlab::QueryLimiting.enable! end end |