summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-26 12:13:10 +0000
committerNick Thomas <nick@gitlab.com>2019-06-26 12:13:10 +0000
commit294293926ab64dfd27f2f75004766435c8705f4f (patch)
tree05d3c2872c2841c371177d1a95b4cec764e2e28e
parent069cd1ca7e6204e9441ca7b9f7f45831dfd786f4 (diff)
parentb69890a3fa888ba5d8e1eb9657b7fbba91c781bc (diff)
downloadgitlab-ce-294293926ab64dfd27f2f75004766435c8705f4f.tar.gz
Merge branch '63710-fix-redis-namespace-warning' into 'master'
Trigger flushdb in a way that redis-namespace is happy with Closes #63710 See merge request gitlab-org/gitlab-ce!30039
-rw-r--r--spec/support/sidekiq.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb
index 6c4e11910d3..d1a765f27b9 100644
--- a/spec/support/sidekiq.rb
+++ b/spec/support/sidekiq.rb
@@ -30,6 +30,8 @@ RSpec.configure do |config|
end
config.after(:each, :sidekiq, :redis) do
- Sidekiq.redis { |redis| redis.flushdb }
+ Sidekiq.redis do |connection|
+ connection.redis.flushdb
+ end
end
end